Name change.

diff --git a/Makefile b/Makefile
index c83c182e9c11f4364dc7c2b574023ffebd558d75..0d0c658c12bbf09a78ba54dec96eff9c80828559 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,35 @@
 # Makefile for Eric Raymond's silly hex dumper
 
-# Note: When the version changes, you also have to change the RPM spec file
-VERS=1.4
+VERS=1.5
 
-hex: hex.c
-       $(CC) -DRELEASE=\"$(VERS)\" -O hex.c -o hex
+hexdump: hexdump.c
+       $(CC) -DRELEASE=\"$(VERS)\" -O hexdump.c -o hexdump
 
-SOURCES = READ.ME Makefile hex.c hex.xml hex.spec
+SOURCES = READ.ME COPYING Makefile hexdump.c hexdump.xml hexdump.spec
 
-hex-$(VERS).tar.gz: $(SOURCES) hex.1 
-       @ls $(SOURCES) hex.1 | sed s:^:hex-$(VERS)/: >MANIFEST
-       @(cd ..; ln -s hex hex-$(VERS))
-       (cd ..; tar -czvf hex/hex-$(VERS).tar.gz `cat hex/MANIFEST`)
-       @(cd ..; rm hex-$(VERS))
+hexdump-$(VERS).tar.gz: $(SOURCES) hexdump.1 
+       @ls $(SOURCES) hexdump.1 | sed s:^:hexdump-$(VERS)/: >MANIFEST
+       @(cd ..; ln -s hexdump hexdump-$(VERS))
+       (cd ..; tar -czvf hexdump/hexdump-$(VERS).tar.gz `cat hexdump/MANIFEST`)
+       @(cd ..; rm hexdump-$(VERS))
 
-hex.1: hex.xml
-       xmlto man hex.xml
+hexdump.1: hexdump.xml
+       xmlto man hexdump.xml
 
-install: hex.1 uninstall
-       cp hex /usr/bin
-       cp hex.1 /usr/share/man/man1/hex.1
+install: hexdump.1 uninstall
+       cp hexdump /usr/bin
+       cp hexdump.1 /usr/share/man/man1/hexdump.1
 
 uninstall:
-       rm -f /usr/bin/hex /usr/share/man/man1/hex.
+       rm -f /usr/bin/hexdump /usr/share/man/man1/hexdump.
 
 clean:
-       rm -f hex hex-$(VERS).tar.gz *.rpm
+       rm -f hexdump hexdump-$(VERS).tar.gz *.rpm
 
-dist: hex-$(VERS).tar.gz
+dist: hexdump-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
-RPM = rpmbuild
-RPMFLAGS = -ba
 rpm: dist
-       cp hex-$(VERS).tar.gz $(RPMROOT)/SOURCES;
-       cp hex.spec $(RPMROOT)/SPECS
-       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) hex.spec        
-       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/hex-$(VERS)*.rpm .
-       cp $(RPMROOT)/SRPMS/hex-$(VERS)*.src.rpm .
+       rpmbuild --define 'myversion $(VERS)' -ta hexdump-$(VERS).tar.gz
+       cp $(RPMROOT)/RPMS/*/hexdump-$(VERS)*.rpm .
+       cp $(RPMROOT)/SRPMS/hexdump-$(VERS)*.src.rpm .

diff --git a/hexdump.spec b/hexdump.spec
index 1d08e82f2953f82ce7e828151d41ec07830cb296..b96cbda44e9f33823bf4d612cef3603568fd5632 100644 (file)
--- a/hexdump.spec
+++ b/hexdump.spec
@@ -1,11 +1,12 @@
 Name: hex
-Version: 1.4
+Version: %{nyversion}
 Release: 1
 Summary: yet another hex dumper
 URL: http://www.catb.org/~esr/hex/
 Source0: %{name}-%{version}.tar.gz
 License: BSD-like
 Group: Development/Tools
+%undefine __check_files
 
 %%description 
 Yes, it's yet another hex dumper.  This one produces a nice CP/M-like
@@ -22,5 +23,6 @@ make
 make install
 
 %files
+%doc README COPYING
 /usr/share/man/man1/hex.1
 /usr/bin/hex

diff --git a/hexdump.xml b/hexdump.xml
index 21e4b3d493441b418ce5a91655527bb18361d0f8..11dac43adc4fe0b43e18415b2aafed4214ff2017 100644 (file)
--- a/hexdump.xml
+++ b/hexdump.xml
@@ -2,21 +2,20 @@
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "docbook/docbookx.dtd">
-<refentry id='hex.1'>
+<refentry id='hexdump.1'>
 <refmeta>
-<refentrytitle>hex</refentrytitle>
+<refentrytitle>hexdump</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='date'>Oct 27, 1987</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
-<refname>hex</refname>
-<refpurpose>dump a file to stdout in CP/M-like hex format</refpurpose>
+<refname>hexdump</refname>
+<refpurpose>dump a file to stdout in CP/M-like hexadecimal format</refpurpose>
 </refnamediv>
 <refsynopsisdiv id='synopsis'>
 
 <cmdsynopsis>
-  <!--  hex  [-V] [-w] [-e] [-c] [-g] [-s] [filename...] -->
-  <command>hex</command>  <arg choice='opt'>-V </arg>
+  <command>hexdump</command>  <arg choice='opt'>-V </arg>
   <arg choice='opt'>-w </arg>
   <arg choice='opt'>-e </arg>
   <arg choice='opt'>-c </arg>
@@ -31,7 +30,7 @@
 
 <para>This program provides a facility for obtaining a dump of a
 binary file to stdout.  The default format is a CP/M style
-<command>hex</command> dump with byte offset in file, 16 bytes of
+haxadecimal dump with byte offset in file, 16 bytes of
 <command>hex</command> and 16 bytes of alpha representation with '.'
 for non-printables per line. If no filename is given, hex reads from
 standard input.</para>
@@ -78,16 +77,16 @@ option letter or whitespace-separated.</para>
 
 <para>If the command-line arguments include two or more filenames
 (with - being regarded as a `filename' for standard input),
-<command>hex</command> will emit a one-line header giving the name of
+<command>hexdump</command> will emit a one-line header giving the name of
 the file in front of each input file.</para>
 
 <para>The <option>-s</option> option expects a start offset,
 optionally followed by a comma-separated count. Each of these should
-be a decimal or <command>hex</command> integer (hex must be prefixed
+be a decimal or hexadecimal integer (hexadecimal must be prefixed
 by x or h; leading zeros will be ignored).</para>
 
 <para>The <option>-w</option> option expects a width, formatted as a
-single decimal or <command>hex</command> number in the style of an
+single decimal or haxadecimal number in the style of an
 <option>-s</option> option argument. Odd widths turn on the
 <option>-g</option> option.</para> </refsect1>
 
@@ -96,7 +95,7 @@ used is IBM's ASCII-compatible 96-character SCS set used with Systems
 Network Architecture (SNA).</para> </refsect1>
 
 <refsect1 id='author'><title>AUTHOR</title> <para>Eric S. Raymond
-&lt;esr@thyrsus.com&gt;.  See my home page at <ulink
+<email>esr@thyrsus.com<email>.  See my home page at <ulink
 url='http://www.catb.org/~esr'>http://www.catb.org/~esr</ulink>
 for updates and related resources.</para> 
 </refsect1>