Better packaging.

diff --git a/Makefile b/Makefile
index 2677cbdff64d8bfe9d7d6f0ed0eb7ebe7e168c36..fcdfeaf8e888add010d159c9f7ea45179e20545c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,8 @@
 # and warranty information.
 
 # Note: When the version changes, you also have to change
-#  * the name of the containing directory
-#  * the RPM spec file
-V=1.1
+# the RPM spec file and the LSM.
+VERS=1.2
 
 # Change the line below for your system.  If you are on a Sun or Vax,
 # you may want BSD.
@@ -88,10 +87,23 @@ clobber: clean
 
 SOURCES = READ.ME empire.6 COPYING Makefile BUGS $(FILES) $(HEADERS) MANIFEST empire.lsm empire.spec
 
-empire.tar: $(SOURCES)
-       (cd ..; tar -cvf empire-$(V)/empire.tar `echo $(SOURCES) | sed "/\(^\| \)/s// empire-$(V)\//g"`)
-empire.tar.gz: empire.tar
-       gzip -f empire.tar
-
-empire.shar: $(SOURCES)
-       shar $(SOURCES) >empire.shar
+empire-$(VERS).tar.gz: $(SOURCES)
+       @ls $(SOURCES) | sed s:^:empire-$(VERS)/: >MANIFEST
+       @(cd ..; ln -s empire empire-$(VERS))
+       (cd ..; tar -czvf empire/empire-$(VERS).tar.gz `cat empire/MANIFEST`)
+       @(cd ..; rm empire-$(VERS))
+
+empire-$(VERS).shar:
+       shar $(SOURCES) >empire-$(VERS).shar
+
+dist: empire-$(VERS).tar.gz
+
+RPMROOT=/usr/src/redhat
+RPM = rpm
+RPMFLAGS = -ba
+rpm: dist
+       cp empire-$(VERS).tar.gz $(RPMROOT)/SOURCES;
+       cp empire.spec $(RPMROOT)/SPECS
+       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) empire.spec     
+       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/empire-$(VERS)*.rpm .
+       cp $(RPMROOT)/SRPMS/empire-$(VERS)*.src.rpm .

diff --git a/README b/README
index ec3eee0425d90b4e78b772200db8f47e005c9d0b..72c7f254207886065eafec0f2edd0cc8a431ae7e 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-/* %W% %G% %U% - (c) Copyright 1987, 1988 Chuck Simmons */
+/* (c) Copyright 1987, 1988 Chuck Simmons */
 
 /*
  *    Copyright (C) 1987, 1988 Chuck Simmons
@@ -9,6 +9,10 @@
 
 C Empire Sources
 
+Eric S. Raymond colorized and speed-tuned this and added a
+save-interval option.  The rest of this history is Chuck Simmons's
+original notes.
+
 History
 
        Apparently, this game was originally written outside of Digital,

diff --git a/vms-empire.spec b/vms-empire.spec
index 3e98ec826df9e7c87c5086868c2adc78d4fcf6c6..15250368e8f79d47961b955e7c04601ed253f11c 100644 (file)
--- a/vms-empire.spec
+++ b/vms-empire.spec
@@ -1,10 +1,13 @@
-Description: Solitaire Empire (sometimes called `VMS Empire')
 Name: empire
-Version: 1.1
+Version: 1.2
 Release: 1
-Source: locke.ccil.org:/pub/esr/empire-1.1.tar.gz
+Source: locke.ccil.org:/pub/esr/empire-1.2.tar.gz
 Copyright: BSD-like
 Group: Games
+Summary: Solitaire Empire (sometimes called `VMS Empire')
+
+%description
+Solitaire Empire (sometimes called `VMS Empire')
 
 %prep
 %setup