Improved RPM machinery.

diff --git a/Makefile b/Makefile
index e721bfa851b2b473853ecf1347c3d604781b9cd0..8a165ab32523429c66e651c10204f2fc428a3f8b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the card probability calculator
 #
-VERS=2.3
+VERS=$(shell sed <deal.spec -n -e '/Version: \(.*\)/s//\1/p')
 
 SOURCES = README COPYING Makefile deal.c deal.xml deal.spec
 
@@ -29,9 +29,3 @@ uninstall:
 
 dist: deal-$(VERS).tar.gz
 
-RPMROOT=/usr/src/redhat
-rpm: dist
-       rpmbuild --define 'myversion $(VERS)' -ta deal-$(VERS).tar.gz
-       cp $(RPMROOT)/RPMS/*/deal-$(VERS)*.rpm .
-       cp $(RPMROOT)/SRPMS/deal-$(VERS)*.src.rpm .
-

diff --git a/deal.spec b/deal.spec
index d7410fb5979c655dab4f8b905b8f292724c92fac..2b236dc1b7db4bef247a29b204ac17089a7b23d1 100644 (file)
--- a/deal.spec
+++ b/deal.spec
@@ -1,12 +1,12 @@
 Name: deal
-Version: %{myversion}
+Version: 2.4
 Release: 1
 URL: http://www.catb.org/~esr/deal/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Math
 Summary: calculator for card-draw (nonreplacement) probabilities
-%undefine __check_files
+BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 This program is a calculator for card-draw probabilities.  Specifically
@@ -15,20 +15,32 @@ function.  It can also be used to compute binomial coefficients
 and the gamma function.
 
 %prep
-%setup
+%setup -q
 
 %build
 make
+make deal.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 deal "$RPM_BUILD_ROOT"/usr/bin
+cp deal.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/deal.1
-/usr/bin/deal
+%defattr(-,root,root,-)
+%{_mandir}/man1/deal.1*
+%{_bindir}/deal
 %doc README COPYING
 
 %changelog
+* Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.4-1
+- Source RPMs no longer depend on --define myversion.
+
 * Fri Dec 26 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.3
 - Fixed a man-page bug, updated RPM packaging machinery.