From 38f4818a604bcdaf1a2a1b9f31f6ab15a8121bf8 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 31 Dec 2003 04:51:43 +0000
Subject: [PATCH] New RPM packaging.

---
 Makefile | 38 +++++++++++++++++++++++++-------------
 README   | 19 +++++++++----------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 017ec7b..61ac196 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,33 @@
 #
-# X386 Video Explorer makefile
+# X Video Explorer makefile
 #
-CFLAGS = -g
-LDFLAGS =
+VERS=$(shell sed <xve.spec -n -e '/Version: \(.*\)/s//\1/p')
+
+CFLAGS = -O
 
 xve: xve.c
-	$(CC) $(CFLAGS) xve.c -lm -o xve
+	$(CC) -DREVISION=$(VERS) xve.c -lm -o xve
+
+xve.1: xve.xml
+	xmlto man xve.xml 
+
+clean:
+	rm -f xve xve.o splashscreen.h xve.1 *.rpm *.tar.gz
+
+install: xve xve.1
+	cp xve /usr/bin/xve
+	cp xve.1 /usr/share/man/man1
 
-SOURCES = READ.ME Makefile xve.c xve.1
+uninstall:
+	rm /usr/bin/xve
+	rm /usr/share/man/man1/xve.1
 
-xve.tar: $(SOURCES)
-	tar -cvf xve.tar $(SOURCES)
-xve.tar.gz: xve.tar
-	gzip xve.tar
+SOURCES = README COPYING Makefile xve.c xve.xml xve.spec
 
-xve.shar: $(SOURCES)
-	shar $(SOURCES) >xve.shar
+xve-$(VERS).tar.gz: $(SOURCES) xve.1
+	@ls $(SOURCES) xve.1 | sed s:^:xve-$(VERS)/: >MANIFEST
+	@(cd ..; ln -s xve xve-$(VERS))
+	(cd ..; tar -czvf xve/xve-$(VERS).tar.gz `cat xve/MANIFEST`)
+	@(cd ..; rm xve-$(VERS))
 
-make clean:
-	rm -f xve xve.tar xve.tar.gz xve.shar
+dist: xve-$(VERS).tar.gz
diff --git a/README b/README
index 0e8050f..18ea7a5 100644
--- a/README
+++ b/README
@@ -1,14 +1,12 @@
 			X VIDEO EXPLORER
 
-Configuring video timing parameters for X386 is something of a black art.
-If the VDID standard actually happens, it may become an obsolete art as well.
-In the meantime, this package offers some tools for the perplexed.  It
-includes the following files:
+Automate calculations for generating XFree86 video modelines.  This program
+is meant for the rare cases where you don't already have a functioning
+modeline that can be tweaked with xvidtune(1) or kvideogen(1) or the like;
+it should get you to where you can use those tools.
 
 README		--- this file
-
 Makefile	--- a makefile, what else?
-
 xve.c		--- source for the X Video Explorer
 
 The X Video Explorer tries to help you configure timings for your monitor,
@@ -17,14 +15,14 @@ do some hand-tuning of the results, but xve will should least direct you
 in the right general region of the parameter space (and it automates away
 a lot of grubby calculations).
 
-To use xve you will also need "The Hitchhiker's Guide to XFree86 Video 
-Timings".  You can get this via the following URL:
+To use xve you will also need the "XFree86 Video Timings HOWTO".  You
+should be able to get this via the following URL:
 
 	http://en.tldp.org/HOWTO/XFree86-Video-Timings-HOWTO/
 
-If you don't find it there, search with Lycos or Alta Vista.
+If you don't find it there, search for it by title.
 
-For updates and related resources, http://www.catb.org/~esr/xve
+For updates and related resources, see <http://www.catb.org/~esr/xve>.
 
 			RELEASE NOTES
 
@@ -34,3 +32,4 @@ Release 1.1 (24 Oct 1994):
 Release 1.2 (10 Feb 1996):
 	* Timing guide now distributed separately.
 
+Newer changelog entries are in the RPM spec file.
-- 
2.43.0