shipper-based packaging.

diff --git a/Makefile b/Makefile
index ff72402ffbf6188c4c17b0760568a773d7e04387..e559864cf0af801d4050951721d53ea5f475d789 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -100,8 +100,5 @@ comparator-$(VERS).tar.gz: $(SOURCES) comparator.1
 
 dist: comparator-$(VERS).tar.gz
 
-RPMROOT=/usr/src/redhat
-rpm: dist
-       rpmbuild --define 'myversion $(VERS)' -ta comparator-$(VERS).tar.gz
-       cp $(RPMROOT)/RPMS/*/comparator-$(VERS)*.rpm .
-       cp $(RPMROOT)/SRPMS/comparator-$(VERS)*.src.rpm .
+release: comparator-$(VERS).tar.gz comparator.html
+       shipper -f; rm -f CHANGES ANNOUNCE* *.1 *.html *.rpm *.lsm

diff --git a/comparator.spec b/comparator.spec
index dd83050dd85e8cc7e5578685fa49e57d899da64b..12d2668edddca8d7c0fe889272a456256f0be80e 100644 (file)
--- a/comparator.spec
+++ b/comparator.spec
@@ -7,6 +7,7 @@ Group: Utilities
 URL: http://www.catb.org/~esr/comparator/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
+#Keywords: source code, comparison
 
 %description
 comparator and filterator are a pair of tools for rapidly finding common
@@ -17,17 +18,16 @@ detecting copyright infringement.
 %setup -q
 
 %build
-make
-make comparator.1
+make %{?_smp_mflags} comparator comparator.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/
-pylib=`ls -d /usr/local/lib/python*/site-packages/`
+mkdir -p "$RPM_BUILD_ROOT"%{_bindir}
+mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man1/
+pylib=`ls -d %{_libdir}/python*/site-packages/`
 mkdir -p "$RPM_BUILD_ROOT"${pylib}
-cp comparator filterator "$RPM_BUILD_ROOT"/usr/bin
-cp comparator.1 "$RPM_BUILD_ROOT"/usr/share/man/man1/
+cp comparator filterator "$RPM_BUILD_ROOT"%{_bindir}
+cp comparator.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
 cp comparator.py "$RPM_BUILD_ROOT"${pylib}
 
 %clean
@@ -39,7 +39,7 @@ cp comparator.py "$RPM_BUILD_ROOT"${pylib}
 %{_bindir}/comparator
 %{_bindir}/filterator
 %{_mandir}/man1/comparator.1*
-/usr/local/lib/python*/site-packages/comparator.py
+%{_libdir}/python*/site-packages/comparator.py
 
 %changelog
 * Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.3-1