From: Eric S. Raymond <esr@thyrsus.com>
Date: Sat, 3 Mar 2012 16:16:55 +0000 (-0500)
Subject: Packaging fixups for new version of shipper.
X-Git-Tag: 1.6~6
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=278af9cfe92fb1ff72564b800b6d824a181fd2e5;p=showkey.git

Packaging fixups for new version of shipper.
---

diff --git a/Makefile b/Makefile
index 77697f3..3eeefb1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # showkey -- keystroke echoer
 
-VERS=$(shell sed <showkey.spec -n -e '/Version: \(.*\)/s//\1/p')
+VERS=1.6
 
 showkey: showkey.c
 	$(CC) -DREVISION=$(VERS) showkey.c -o showkey
@@ -12,7 +12,7 @@ showkey.html: showkey.xml
 	xmlto html-nochunks showkey.xml 
 
 clean:
-	rm -f showkey showkey.o showkey.1 *.rpm *.tar.gz
+	rm -f showkey showkey.o showkey.1 *.tar.gz
 	rm -f MANIFEST SHIPPER.*
 
 install: showkey.1
@@ -23,7 +23,7 @@ uninstall:
 	rm /usr/bin/showkey
 	rm /usr/share/man/man1/showkey.1
 
-SOURCES = README COPYING Makefile showkey.c showkey.xml showkey.spec
+SOURCES = README COPYING NEWS control Makefile showkey.c showkey.xml
 
 showkey-$(VERS).tar.gz: $(SOURCES) showkey.1
 	@ls $(SOURCES) showkey.1 | sed s:^:showkey-$(VERS)/: >MANIFEST
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..610019d
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,13 @@
+1.6 @ 2012-03-03:
+    Packaging update for new version of shipper. No more RPM spec.
+
+1.5 @ 2003-10-21:
+    Feature added: now displays control-key formulas as well as ASCII memonics.
+    Documentation has been significantly upgraded.
+
+1.4 @ 2003-12-29
+    RPMs can now be built by non-root user.
+
+1.3 @ 2002-08-27
+    Change the implementation to use termios(3) for better portability.
+    Only reference portable signals.
diff --git a/control b/control
new file mode 100644
index 0000000..351106b
--- /dev/null
+++ b/control
@@ -0,0 +1,15 @@
+# This is not a real Debian control file
+# It's project metadata for the shipper tool
+
+Package: showkey
+
+Description: a simple keystroke visualizer
+ All this program does is read keystrokes and spit them back at you in
+ a simple, printable form.  This is one of these silly little utilities
+ that you never think you'll need until some unexpected situation pops
+ up and you have to have it.  Then you get to be mugged by the details
+ of tty-interface code, yippee.  Never again!
+
+XBS-Destinations: freecode
+
+Homepage: http://www.catb.org/~esr/showkey
diff --git a/showkey.spec b/showkey.spec
deleted file mode 100644
index 41debde..0000000
--- a/showkey.spec
+++ /dev/null
@@ -1,52 +0,0 @@
-Name: showkey
-Version: 1.5
-Release: 1
-URL: http://www.catb.org/~esr/showkey/
-Source0: %{name}-%{version}.tar.gz
-License: MIT
-Group: Utilities/System
-Summary: echo raw keystrokes in a readable form
-Packager: Eric S. Raymond <esr@thyrsus.com>
-BuildRoot: %{_tmppath}/%{name}-root
-#Destinations: freshmeat
-
-%description
-All this program does is read keystrokes and spit them back at you in
-a simple, printable form.  This is one of these silly little utilities
-that you never think you'll need until some unexpected situation pops
-up and you have to have it.  Then you get to be mugged by the details
-of tty-interface code, yippee.  Never again!
-
-%prep
-%setup -q
-
-%build
-make %{?_smp_mflags} showkey showkey.1
-
-%install
-[ "$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 showkey "$RPM_BUILD_ROOT"%{_bindir}
-cp showkey.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
-
-%clean
-[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-
-%files
-%defattr(-,root,root,-)
-%{_mandir}/man1/showkey.1*
-%{_bindir}/showkey
-%doc README
-
-%changelog
-* Thu Oct 21 2003 Eric S. Raymond <esr@snark.thyrsus.com> 1.5-1
-- Feature added: now displays control-key formulas as well as ASCII memonics.
-- Documentation has been significantly upgraded.
-
-* Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 1.4-1
-- RPMs can now be built by non-root user.
-
-* Tue Aug 27 2002 Eric S. Raymond <esr@snark.thyrsus.com> 1.3-1
-- Change the implementation to use termios(3) for better portability.
-- Only reference portable signals.