Rewrote `dist' and `release' rules to generate version numbers in all files

automatically.

Released as version 1.99.3.

diff --git a/ChangeLog b/ChangeLog
index 5420e4e96a19818e9a903fcc9b9d18d1b19a554b..03a77e20358b81eb1e4207d55f74f71a09b8f458 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 25 21:28:49 1999  Martin Mares  <mj@albireo.ucw.cz>
+
+       * Makefile: Added target `release' which substitutes new version
+       number to .spec, .lsm and README. Also rewrote target `dist'.
+
+       * Released as 1.99.3.
+
 Sun Jan 24 22:10:36 1999  Martin Mares  <mj@albireo.ucw.cz>
 
        * lib/header.h: Until kernel adopts new layout of PCI

diff --git a/Makefile b/Makefile
index 15ccfb2bc00416f417e6d9bc932ee9f46a5d5555..c009be44ea16e7250edee4d278e043ae650007b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 1999/01/24 21:48:11 mj Exp $
+# $Id: Makefile,v 1.12 1999/01/25 20:51:06 mj Exp $
 # Makefile for Linux PCI Utilities
 # (c) 1998--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 
@@ -6,12 +6,13 @@ OPT=-O2 -fomit-frame-pointer
 #OPT=-O2 -g
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Werror
 
-VERSION=1.99.2-alpha
-DATE=22 January 1999
-
 ROOT=/
 PREFIX=/usr
 
+VERSION=1.99.3
+SUFFIX=-alpha
+DATE=99-01-25
+
 export
 
 all: lib lspci setpci lspci.8 setpci.8
@@ -30,11 +31,12 @@ setpci.o: setpci.c pciutils.h lib/libpci.a
 common.o: common.c pciutils.h lib/libpci.a
 
 %.8: %.man
-       sed <$< >$@ "s/@TODAY@/$(DATE)/;s/@VERSION@/pciutils-$(VERSION)/"
+       sed <$< >$@ "s/@TODAY@/`date -d $(DATE) '+%d %B %Y'`/;s/@VERSION@/pciutils-$(VERSION)$(SUFFIX)/"
 
 clean:
        rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core`
        rm -f lspci setpci lib/config.* *.8
+       rm -rf dist
 
 install: all
        install -o root -g root -m 755 -s lspci setpci $(ROOT)/sbin
@@ -43,9 +45,21 @@ install: all
        # Remove relics from old versions
        rm -f $(ROOT)/etc/pci.ids
 
+release:
+       sed "s/^\\(Version:[    ]*\\)[0-9.]*/\\1$(VERSION)/;s/^\\(Entered-date:[        ]*\\)[0-9]*/\\1`date -d$(DATE) '+%y%m%d'`/;s/\\(pciutils-\\)[0-9.]*/\\1$(VERSION)\\./" <pciutils.lsm >pciutils.lsm.new
+       sed "s/^\\(Version:[    ]*\\)[0-9.]*/\\1$(VERSION)/" <pciutils.spec >pciutils.spec.new
+       sed "s/\\(, version \\).*\./\\1$(VERSION)$(SUFFIX)./" <README >README.new
+       mv pciutils.lsm.new pciutils.lsm
+       mv pciutils.spec.new pciutils.spec
+       mv README.new README
+
+REL=pciutils-$(VERSION)
+
 dist: clean
-#      cp /usr/src/linux/include/linux/pci.h lib/header.h
-       sh -c 'X=`pwd` ; X=`basename $$X` ; cd .. ; tar czvvf /tmp/$$X.tar.gz $$X --exclude CVS --exclude tmp'
-#      rm -f lib/header.h
+       mkdir dist
+       cp -a . dist/$(REL)
+       rm -rf `find dist/$(REL) -name CVS -o -name tmp` dist/$(REL)/dist
+       [ -f dist/$(REL)/lib/header.h ] || cp /usr/src/linux/include/linux/pci.h dist/$(REL)/lib/header.h
+       cd dist ; tar czvvf /tmp/$(REL).tar.gz $(REL)
 
-.PHONY: all lib clean install dist man
+.PHONY: all lib clean install dist man release

diff --git a/README b/README
index b79a626db0d9a1288bbe1a6226d99267cbc249b7..390d6ff5e7603c311aea83de8cb4da0c48f1cc6e 100644 (file)
--- a/README
+++ b/README
@@ -53,4 +53,3 @@ notes and other news: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html.
 TODO:
        - lspci: "scan hard" function
        - lib: "syscall" access method
-       - .lsm and .spec

diff --git a/pciutils.lsm b/pciutils.lsm
index cc1bbc4251c24d992f78ca6b5ff86a57514b7462..cd30a1328e010ae755d2c34061e9fd1143627b13 100644 (file)
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title:          Linux PCI Utilities
-Version:        1.10
-Entered-date:   990119
+Version:        1.99.2
+Entered-date:   990122
 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus. Requires
                kernel version 2.1.82 or newer (supporting the /proc/bus/pci
@@ -9,7 +9,7 @@ Description:    This package contains various utilities for inspecting and
 Keywords:       kernel, pci, proc, lspci, setpci
 Author:         mj@atrey.karlin.mff.cuni.cz (Martin Mares)
 Maintained-by:  mj@atrey.karlin.mff.cuni.cz (Martin Mares)
-Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-1.10.tar.gz
-Alternate-site: sunsite.unc.edu pub/Linux/hardware/pciutils-1.10.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-1.99.2.tar.gz
+Alternate-site: sunsite.unc.edu pub/Linux/hardware/pciutils-1.99.2.tar.gz
 Copying-policy: GPL
 End

diff --git a/pciutils.spec b/pciutils.spec
index c7c1de1f6e6b1356be77ff9b5429c6acf0bbb946..b62ae46afeb2a5b384bddcd38d22cd6c06784972 100644 (file)
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,5 +1,5 @@
 Name:          pciutils
-Version:       1.10
+Version:       1.99.2
 Release:       1
 Source:                ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:     GNU GPL