shipper-based packaging.

diff --git a/Makefile b/Makefile
index 8a165ab32523429c66e651c10204f2fc428a3f8b..b086a690333a0506cb632b81f3d579ed85fc4ec0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,9 @@ deal-$(VERS).tar.gz: $(SOURCES) deal.1
 deal.1: deal.xml
        xmlto man deal.xml
 
+deal.html: deal.xml
+       xmlto html deal.xml
+
 install: deal.1 uninstall
        cp deal /usr/bin
        cp deal.1 /usr/share/man/man1/deal.1
@@ -29,3 +32,6 @@ uninstall:
 
 dist: deal-$(VERS).tar.gz
 
+release: deal-$(VERS).tar.gz deal.html
+       shipper -f; rm -f CHANGES ANNOUNCE* *.1 *.html *.rpm *.lsm MANIFEST
+

diff --git a/deal.spec b/deal.spec
index 2b236dc1b7db4bef247a29b204ac17089a7b23d1..d6c624d1bf9a0e2ac09c015a2bc55553f5f20957 100644 (file)
--- a/deal.spec
+++ b/deal.spec
@@ -7,6 +7,7 @@ License: GPL
 Group: Applications/Math
 Summary: calculator for card-draw (nonreplacement) probabilities
 BuildRoot: %{_tmppath}/%{name}-root
+#Keywords: card, MtG, game, probability
 
 %description
 This program is a calculator for card-draw probabilities.  Specifically
@@ -18,15 +19,14 @@ and the gamma function.
 %setup -q
 
 %build
-make
-make deal.1
+make %{?_smp_mflags} deal deal.1
 
 %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/
+mkdir -p "$RPM_BUILD_ROOT"%{_bindir}
+mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man1/
+cp deal "$RPM_BUILD_ROOT"%{_bindir}
+cp deal.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
 
 %clean
 [ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"