Improved build.

diff --git a/Makefile b/Makefile
index 795db6b987ea981eda9c96bb81bd6f72a19fd663..50eec9069f59d7c25ebcfa625d3fbe36152d30f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,20 +15,25 @@ splashscreen.h: splashscreen
 clean:
        rm -f ascii ascii.tar* ascii.shar ascii.o splashscreen.h
 
-SOURCES = Makefile ascii.c ascii.1 ascii.lsm ascii.spec 
+SOURCES = Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen
 
-ascii-$(V).tar: $(SOURCES)
-       tar --name-prefix ascii-$(V) -cf ascii-$(V).tar $(SOURCES)
-
-ascii-$(V).tar.gz: ascii-$(V).tar
-       gzip -f ascii-$(V).tar
+ascii-$(V).tar.gz: $(SOURCES)
+       @ls $(SOURCES) | sed s:^:ascii-$(V)/: >MANIFEST
+       @(cd ..; ln -s ascii ascii-$(V))
+       (cd ..; tar -czvf ascii/ascii-$(V).tar.gz `cat ascii/MANIFEST`)
+       @(cd ..; rm ascii-$(V))
 
 ascii-$(V).shar:
        shar $(SOURCES) >ascii-$(V).shar
 
 dist: ascii-$(V).tar.gz
 
-rpm: ascii-$(V).tar.gz
-       cp ascii-$(V).tar.gz /usr/src/SOURCES
-       cp ascii.spec /usr/src/SPECS/ascii-$(V)-1.spec
-       rpm -ba ascii-$(V)-1.spec
+RPMROOT=/usr/src/redhat
+RPM = rpm
+RPMFLAGS = -ba
+rpm: dist
+       cp ascii-$(V).tar.gz $(RPMROOT)/SOURCES;
+       cp ascii.spec $(RPMROOT)/SPECS
+       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) ascii.spec      
+       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/ascii-$(V)*.rpm .
+       cp $(RPMROOT)/SRPMS/ascii-$(V)*.src.rpm .

diff --git a/ascii.spec b/ascii.spec
index a68879416f6c89372c056e499b7abb3ed559e45a..ff5004e7a03f68eea934f6e1e37eaa229c45c38b 100644 (file)
--- a/ascii.spec
+++ b/ascii.spec
@@ -1,10 +1,18 @@
-Description: interactive ASCII name and synonym chart
 Name: ascii
 Version: 2.4
 Release: 1
 Source: locke.ccil.org:/pub/esr/ascii-2.4.tar.gz
 Copyright: distributable
 Group: Utilities/Text
+Summary: interactive ASCII name and synonym chart
+
+%description
+The ascii utility provides easy conversion between various byte representations
+and the American Standard Code for Information Interchange (ASCII) character
+table.  It knows about a wide variety of hex, binary, octal, Teletype mnemonic,
+ISO/ECMA code point, slang name, and other representations.  Given any one on
+the command line, it will try to display all others.  Called with no arguments
+it displays a handy small ASCII chart.
 
 %prep
 %setup