Ready to freeze.

diff --git a/Makefile b/Makefile
index 93538bd8fd800f7fcf9610b65e0ff9e23711dac4..2edfdb382c537097f1819ff42cff89190402ec82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,22 +84,12 @@ clobber: clean
 SOURCES = README NEWS vms-empire.6 COPYING Makefile BUGS AUTHORS $(FILES) $(HEADERS) MANIFEST vms-empire.spec
 
 vms-empire-$(VERS).tar.gz: $(SOURCES) vms-empire.6
-       @ls $(SOURCES) vms-empire.6 | sed s:^:vms-empire-$(VERS)/: >MANIFEST
+       @ls $(SOURCES) | sed s:^:vms-empire-$(VERS)/: >MANIFEST
        @(cd ..; ln -s vms-empire vms-empire-$(VERS))
        (cd ..; tar -czvf vms-empire/vms-empire-$(VERS).tar.gz `cat vms-empire/MANIFEST`)
        @(cd ..; rm vms-empire-$(VERS))
 
 dist: vms-empire-$(VERS).tar.gz
 
-RPMROOT=/usr/src/redhat
-RPM = rpmbuild
-RPMFLAGS = -ba
-rpm: dist
-       cp vms-empire-$(VERS).tar.gz $(RPMROOT)/SOURCES;
-       cp vms-empire.spec $(RPMROOT)/SPECS
-       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) vms-empire.spec 
-       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/vms-empire-$(VERS)*.rpm .
-       cp $(RPMROOT)/SRPMS/vms-empire-$(VERS)*.src.rpm .
-
-
-
+release: vms-empire-$(VERS).tar.gz
+       shipper -f; rm -f CHANGES ANNOUNCE* *.6 *.html *.rpm *.lsm MANIFEST

diff --git a/vms-empire.spec b/vms-empire.spec
index 8bb156eaf94a9ea99567a0624f95feb73024b489..cba436b0b0b7eab5b4ad1f87b37c3d990d6398bf 100644 (file)
--- a/vms-empire.spec
+++ b/vms-empire.spec
@@ -1,5 +1,5 @@
 Name: vms-empire
-Version: 1.6
+Version: 1.7
 Release: 1
 URL: http://www.catb.org/~esr/vms-empire/
 Source: %{name}-%{version}.tar.gz
@@ -39,6 +39,10 @@ cp vms-empire.6 "$RPM_BUILD_ROOT"%{_mandir}/man6/
 %{_bindir}/vms-empire
 
 %changelog
+* Mon Sep 27 2004 Eric S. Raymond <esr@snark.thyrsus.com> 1.7-1
+- Documentation fixes.  The old empire.doc file has been replaced
+  by the man page.
+
 * Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 1.6-1
 - Source RPMs can be built by non-root user.