New packaging machinery.

diff --git a/Makefile b/Makefile
index 130b7538968ea280b1fa9b897cefdd97fd23ea2f..5fdf125e72de6429ea46f6d51fbeef236a87b5cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # ascii -- interactive ASCII reference
 
-# Note: When the version changes, you also have to change the RPM spec file.
-VERS=3.3
+VERS=3.4
 
 CFLAGS = -O
 
@@ -28,7 +27,7 @@ uninstall:
        rm /usr/bin/ascii
        rm /usr/share/man/man1/ascii.1
 
-SOURCES = README COPYING Makefile ascii.c ascii.xml ascii.spec splashscreen nametable ascii.cgi
+SOURCES = README COPYING NEWS Makefile ascii.c ascii.xml ascii.spec splashscreen nametable ascii.cgi
 
 ascii-$(VERS).tar.gz: $(SOURCES) ascii.1
        @ls $(SOURCES) ascii.1 | sed s:^:ascii-$(VERS)/: >MANIFEST
@@ -39,11 +38,7 @@ ascii-$(VERS).tar.gz: $(SOURCES) ascii.1
 dist: ascii-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
-RPM = rpmbuild
-RPMFLAGS = -ba
 rpm: dist
-       cp ascii-$(VERS).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-$(VERS)*.rpm .
+       rpmbuild --define 'myversion $(VERS)' -ta ascii-$(VERS).tar.gz
+       cp $(RPMROOT)/RPMS/*/ascii-$(VERS)*.rpm .
        cp $(RPMROOT)/SRPMS/ascii-$(VERS)*.src.rpm .

diff --git a/ascii.c b/ascii.c
index 8ffad1337980757de732741cfd3800ecc03cbd7b..820cecc51781a04b68174263c22ab1ba8326c2d0 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -1,22 +1,6 @@
 /*
  * ascii.c -- quick crossreference for ASCII character aliases
  *
- * by Eric S. Raymond <esr@snark.thyrsus.com>, v1.0 March 1990
- *     v1.1 November 1990  -- revised `slang' from the 2.2 pronunciation guide
- *     v1.2 March 1995     -- Fixed a core-dump bug
- *     v1.3 October 1995   -- Fixed a bug that shows up only under ELF.
- *     v2.0 December 1995  -- Interpret ISO-style code table escapes.
- *     v2.1 August 1997    -- merge in changes by Ioannis Tambouras.
- *     v2.2 November 1997  -- merge in more changes by Ioannis Tambouras.
- *      v2.3 November 1997  -- incorporated Colin Plumb's splash-screen idea.
- *     v2.4 December 1998  -- additions by Brian Ginsbach.
- *     v2.5 December 1998  -- -s option by David N. Welton.
- *     v2.6 June 1999      -- bug fixes by M.R. van Schouwen.
- *     v2.7 October 1999   -- minor packaging and option changes.
- *     v3.0 July 2000      -- added HTML/SGML entity sames
- *      v3.1 July 2002      -- documentation converted to XML
- *     v3.2 April 2003     -- Added more XML entity names, intoduced nametable
- *
  * Tries to interpret arguments as names or aliases of ascii characters
  * and dumps out *all* the aliases of each. Accepts literal characters,
  * standard mnemonics, C-style backslash escapes, caret notation for control

diff --git a/ascii.spec b/ascii.spec
index 729b4bd8e67c94594a048304b24874efbe08e2b1..cfaf9ac2eca0b6308f8af8e0ae434017832a34a6 100644 (file)
--- a/ascii.spec
+++ b/ascii.spec
@@ -1,5 +1,5 @@
 Name: ascii
-Version: 3.3
+Version: %{myversion}
 Release: 1
 URL: http://www.catb.org/~esr/ascii/
 Source0: %{name}-%{version}.tar.gz