Improved RPM packaging.

diff --git a/Makefile b/Makefile
index fe74623f20d697e444c941f16be23021755dd3ac..82ef41240c41be7b8c0f69d319d36e68f0137cf6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for Eric Raymond's silly hex dumper
 
-VERS=1.5
+VERS=$(shell sed <hexdump.spec -n -e '/Version: \(.*\)/s//\1/p')
 
 hexdump: hexdump.c
        $(CC) -DRELEASE=\"$(VERS)\" -O hexdump.c -o hexdump
@@ -28,8 +28,3 @@ clean:
 
 dist: hexdump-$(VERS).tar.gz
 
-RPMROOT=/usr/src/redhat
-rpm: dist
-       rpmbuild --define 'myversion $(VERS)' -ta hexdump-$(VERS).tar.gz
-       cp $(RPMROOT)/RPMS/*/hexdump-$(VERS)*.rpm .
-       cp $(RPMROOT)/SRPMS/hexdump-$(VERS)*.src.rpm .

diff --git a/hexdump.spec b/hexdump.spec
index 519ebe448e0b13c637959c37911985d510a1fa00..44fa1c671c12bd5179b1845421a4d1eb5a890137 100644 (file)
--- a/hexdump.spec
+++ b/hexdump.spec
@@ -1,12 +1,12 @@
 Name: hexdump
-Version: %{myversion}
+Version: 1.6
 Release: 1
 Summary: yet another hex dumper
 URL: http://www.catb.org/~esr/hexdump/
 Source0: %{name}-%{version}.tar.gz
 License: BSD-like
 Group: Development/Tools
-%undefine __check_files
+BuildRoot: %{_tmppath}/%{name}-root
 
 %%description 
 Yes, it's yet another hex dumper.  This one produces a nice CP/M-like
@@ -14,15 +14,28 @@ format by default and can do EBCDIC.  It's internationalized, too.
 Has many nifty formatting functions.
 
 %prep
-%setup
+%setup -q
 
 %build
-make
+make hexdump hexdump.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 hexdump "$RPM_BUILD_ROOT"/usr/bin
+cp hexdump.1 "$RPM_BUILD_ROOT"/usr/share/man/man1/
+
+%clean
+[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %doc README COPYING
-/usr/share/man/man1/hexdump.1
-/usr/bin/hexdump
+%defattr(-,root,root,-)
+%{_mandir}/man1/hexdump.1*
+%{_bindir}/hexdump
+
+%changelog
+* Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 1.6-1
+- Source RPMs no longer depend on --define myversion
+