Improved RPM packaging.

diff --git a/Makefile b/Makefile
index 33cf76c1c1c89e45d8fb9f1208f4359aac7f248c..a3fc180ae4561045e016ff99c755c53e473ee1cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for the imgsizer distribution
-VERS=2.5
+VERS=$(shell sed <imgsizer.spec -n -e '/Version: \(.*\)/s//\1/p')
 
 # These choices are correct for Linux.  Season to taste.
 BINDIR = /usr/bin
@@ -20,7 +20,7 @@ clean:
 imgsizer.1: imgsizer.xml
        xmlto man imgsizer.xml
 
-SOURCES = READ.ME Makefile imgsizer.spec \
+SOURCES = README COPYING Makefile imgsizer.spec \
        imgsizer imgsizer.xml \
        test-before.html test-converted.html test.png tnhd2.jpg
 
@@ -38,12 +38,6 @@ test:
 
 dist: imgsizer-$(VERS).tar.gz
 
-# Make RPMs.  You need to be root to make this work
-RPMROOT=/usr/src/redhat
-rpm: dist
-       rpmbuild --target noarch --define 'myversion $(VERS)' -ta imgsizer-$(VERS).tar.gz
-       cp $(RPMROOT)/RPMS/noarch/imgsizer-$(VERS)*.noarch.rpm .
-
 
 
 

diff --git a/imgsizer.spec b/imgsizer.spec
index 01e7a70d1fd5f1adce755f75b7ea90a71188138a..098473f730520df7bb2ad912193dd46f8a5be7d6 100644 (file)
--- a/imgsizer.spec
+++ b/imgsizer.spec
@@ -1,27 +1,41 @@
 Name: imgsizer
-Version: %{myversion}
+Version: 2.6
 Release: 1
 Summary: compute WIDTH and HEIGHT attribues for IMG tags
 URL: http://www.catb.org/~esr/imgsizer/
-Source: %{name}-%{myversion}.tar.gz
+Source: %{name}-%{version}.tar.gz
 License: MIT-like
 Group: Utilities/System
-%undefine __check_files
+BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 This tool auto-generates or corrects WIDTH and HEIGHT parameters
 into HTML IMG tags, making page loading faster.
 
 %prep
-%setup
+%setup -q
 
 %build
-echo "No build step is required."
+make imgsizer.1
 
 %install
-make install
+[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+mkdir -p "$RPM_BUILD_ROOT"/usr/bin
+mkdir -p "$RPM_BUILD_ROOT"/usr/share/man/man1/
+cp imgsizer "$RPM_BUILD_ROOT"/usr/bin
+cp imgsizer.1 "$RPM_BUILD_ROOT"/usr/share/man/man1/
+
+%clean
+[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
 
 %files
-/usr/share/man/man1/imgsizer.1
-/usr/bin/imgsizer
+%doc README COPYING
+%defattr(-,root,root,-)
+%{_mandir}/man1/imgsizer.1*
+%{_bindir}/imgsizer
+
+%changelog
+* Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.6-1
+- Source RPMs no longer depend on --define myversion.
+