New packaging machinery.

diff --git a/Makefile b/Makefile
index 837fc4ee89aad737c78ea316da098509a2fe904a..5233c39e002b38b340646dc1a4707dbd915ad20c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 #
 # Makefile for the CUPL/CORC project
 #
-
-# Note: When the version changes, you also have to change the RPM spec file.
-VERS=1.4
+VERS=1.5
 
 CDEBUG = -g    # use -O for production, -g for debugging
 YFLAGS = -vt   # use -l for production, -vt for debugging
@@ -49,7 +47,7 @@ lextest: lexer.c tokens.h tokdump.o
 cupl.1: cupl.xml
        xmlto man cupl.xml
 
-DOCS = READ.ME COPYING NEWS corc.doc cupl.doc cupl.xml
+DOCS = READ.ME COPYING corc.doc cupl.doc cupl.xml cupl.spec
 SOURCES = Makefile cupl.[lyh] $(MODULES:.o=.c)
 TESTS = test/[abcdefghijklmnopqrstuvwxyz]* test/MAKEREGRESS test/REGRESS test/TESTALL
 
@@ -62,13 +60,9 @@ cupl-$(VERS).tar.gz: $(SOURCES) $(DOCS) cupl.1
 dist: cupl-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
-RPM = rpm
-RPMFLAGS = -ba
 rpm: dist
-       cp cupl-$(VERS).tar.gz $(RPMROOT)/SOURCES;
-       cp cupl.spec $(RPMROOT)/SPECS
-       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) cupl.spec       
-       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/cupl-$(VERS)*.rpm .
+       rpmbuild --define 'myversion $(VERS)' -ta cupl-$(VERS).tar.gz
+       cp $(RPMROOT)/RPMS/*/cupl-$(VERS)*.rpm .
        cp $(RPMROOT)/SRPMS/cupl-$(VERS)*.src.rpm .
 
 clean:

diff --git a/READ.ME b/READ.ME
index 6d3656419e88876d4fa3b42e9e46543734fad54e..6908561451546a01c72c1db11168942ebdc5d2a1 100644 (file)
--- a/READ.ME
+++ b/READ.ME
@@ -18,7 +18,7 @@ CORC is a near-subset of CUPL.  There are some minor differences in keywords.
 In CORC, the statement GO TO <block> is equivalent to CUPL's GO TO <block> END.
 
 The cupl implementation is a Retrocomputing Museum project.  The
-Retrocomputing Museum <http://www.tuxedo.org/retro/retromuseum.html>
+Retrocomputing Museum <http://www.catb.org/retro/retromuseum.html>
 revives long-dead languages for the benefit of students and historians
 of programming-language design.  CUPL was chosen as a representative
 of a significant class of mid-1960s teaching languages.
@@ -31,7 +31,7 @@ READ.ME                       -- this file
 cupl.doc               -- transcription of the original CUPL documentation
 corc.doc               -- transcription of the original CORC documentation
 cupl.xml               -- description and discussion of the language
-NEWS                   -- project history
+cupl.spec              -- project history is in this RPM spec file
 
                        Source files
 
@@ -96,7 +96,7 @@ REGRESS                       -- perform regression test on the front end
   BEGIN, DEC, DECREASE, EQL, GEQ, GTR, INC, INCREASE, INT, LSS, NEQ, NOTE,
   REPEAT, TITLE, UNTIL, and $ are also reserved words in CORC.
 
-Send comments, bug reports, and fixes to esr@snark.thyrsus.com.  Also see
-my home page at http://www.tuxedo.org/~esr/home.html for updates and other
-related resources.
+Send comments, bug reports, and fixes to esr@thyrsus.com.  Also see my
+home page at http://www.catb.org/~esr for updates and other related
+resources.
 

diff --git a/cupl.spec b/cupl.spec
index c9c0ea742dcc5ae2bd7afe0fafb7d0a51970b5d6..e261f4a40e97b99e34c646b4f64d20e7246ad949 100644 (file)
--- a/cupl.spec
+++ b/cupl.spec
@@ -1,11 +1,12 @@
 Name: cupl
-Version: 1.4
+Version: %{myversion}
 Release: 1
-URL: http://www.tuxedo.org/~esr/
+URL: http://www.tuxedo.org/~esr/cupl/
 Source0: %{name}-%{version}.tar.gz
-Copyright: GPL
+License: GPL
 Group: Languages
 Summary: Interpreter for the archaic CUPL and CORC programming languages.
+%undefine __check_files
 
 %description
 Interpreter for the archaic CUPL and CORC programming languages.
@@ -23,6 +24,27 @@ cp cupl /usr/bin
 cp cupl.1 /usr/share/man/man1/cupl.1
 
 %files
-%doc READ.ME COPYING NEWS corc.doc cupl.doc test
+%doc READ.ME COPYING corc.doc cupl.doc test
 /usr/bin/cupl
 /usr/share/man/man1/cupl.1
+
+%changelog
+* Fri Dec 26 2003 Eric S. Raymond <esr@thyrsus.com> 1.5 
+- Updated RPM packaging machinery.
+
+* Tue Jul 30 2000 Eric S. Raymond <esr@thyrsus.com> 1.4
+- Move documentation to XML.
+
+* Thu Jul 27 2000 Eric S. Raymond <esr@thyrsus.com> 1.3
+- Cleanup release.  Use modern packaging and RPMs.
+
+RPM chokes on the older dates below.
+
+Fri Jun 28 1996 Eric S. Raymond <esr@thyrsus.com> 1.2
+- Fixed off-by-one bug in TITLE processing.
+- Merged tour.doc into cupl.mm.
+- Added "Hello World" program.
+
+Fri Nov 08 1994 Eric S. Raymond <esr@thyrsus.com> 1.1
+- Added CORC support.
+- Fixed a core-dump bug in the prettyprinter.

diff --git a/cupl.xml b/cupl.xml
index 68506a424a1826e1d107af560bf9a6a096cfcf6b..dfda866e9deb673dc709b8ec43c1c21ad3905cbd 100644 (file)
--- a/cupl.xml
+++ b/cupl.xml
@@ -1251,5 +1251,9 @@ CORC-specific keywords (NOTE, BEGIN, DEC, DECREASE, EQL, GEQ, GTR,
 INC, INCREASE, INT, LEQ, LSS, NEQ, REPEAT, TITLE, UNTIL, $) during
 lexing, and execute() modifies its behavior appropriately.</para>
 </refsect1>
+<refsect1 id='author'><title>AUTHOR</title>
+
+<para>Eric S. Raymond <email>esr@snark.thyrsus.com</email>.</para>
+</refsect1>
 </refentry>