From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 11 Jan 2004 19:54:16 +0000 (+0000)
Subject: Ready to go with new shipper machinery.
X-Git-Tag: 3-6
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=080c1e836e9cbac86698fd9302ad0dcef11e156c;p=ascii.git

Ready to go with new shipper machinery.
---

diff --git a/Makefile b/Makefile
index 95eb963..7c223dd 100644
--- a/Makefile
+++ b/Makefile
@@ -16,16 +16,19 @@ nametable.h: nametable
 ascii.1: ascii.xml
 	xmlto man ascii.xml 
 
+ascii.html: ascii.xml
+	xmlto html ascii.xml 
+
 clean:
 	rm -f ascii ascii.o splashscreen.h ascii.1 *.rpm *.tar.gz
 
 install: ascii ascii.1
-	cp ascii /usr/bin/ascii
-	cp ascii.1 /usr/share/man/man1
+	cp ascii $(DESTDIR)/usr/bin/ascii
+	cp ascii.1 $(DESTDIR)/usr/share/man/man1
 
 uninstall:
-	rm /usr/bin/ascii
-	rm /usr/share/man/man1/ascii.1
+	rm $(DESTDIR)/usr/bin/ascii
+	rm $(DESTDIR)/usr/share/man/man1/ascii.1
 
 SOURCES = README COPYING Makefile ascii.c ascii.xml ascii.spec splashscreen nametable ascii.cgi
 
@@ -36,3 +39,6 @@ ascii-$(VERS).tar.gz: $(SOURCES) ascii.1
 	@(cd ..; rm ascii-$(VERS))
 
 dist: ascii-$(VERS).tar.gz
+
+ship: ascii-$(VERS).tar.gz ascii.html
+	shipper -f
diff --git a/ascii.spec b/ascii.spec
index ce0b91c..6b910ce 100644
--- a/ascii.spec
+++ b/ascii.spec
@@ -1,5 +1,5 @@
 Name: ascii
-Version: 3.5
+Version: 3.6
 Release: 1
 URL: http://www.catb.org/~esr/ascii/
 Source0: %{name}-%{version}.tar.gz
@@ -8,6 +8,7 @@ Group: Utilities/Text
 Summary: interactive ASCII name and synonym chart
 Packager: Eric S. Raymond <esr@thyrsus.com>
 BuildRoot: %{_tmppath}/%{name}-root
+#Keywords: ASCII
 
 %description
 The ascii utility provides easy conversion between various byte representations
@@ -21,18 +22,18 @@ with no arguments it displays a handy small ASCII chart.
 %setup -q
 
 %build
-make
-make ascii.1
+make %{?_smp_mflags} ascii ascii.1
 
 %install
-[ ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p "$RPM_BUILD_ROOT"/usr/bin
-mkdir -p "$RPM_BUILD_ROOT"/usr/share/man/man1/
-cp ascii "$RPM_BUILD_ROOT"/usr/bin
-cp ascii.1 "$RPM_BUILD_ROOT"/usr/share/man/man1/
+[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+mkdir -p "$RPM_BUILD_ROOT"%{_bindir}
+mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man1/
+cp ascii "$RPM_BUILD_ROOT"%{_bindir}
+cp ascii.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
 
 %clean
-[ ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+
 %files
 %defattr(-,root,root,-)
 %{_mandir}/man1/ascii.1*
@@ -40,6 +41,9 @@ cp ascii.1 "$RPM_BUILD_ROOT"/usr/share/man/man1/
 %doc README COPYING
 
 %changelog
+* Sun Jan 11 2004 Eric S. Raymond <esr@snark.thyrsus.com> 3.6-1
+- Fix brown-paper-bag bug in the Space entry.
+
 * Sun Dec 28 2003 Eric S. Raymond <esr@snark.thyrsus.com> 3.5-1
 - Source RPMs no longer require myversion to be defined.