From 272915d739eedc6d8f8132c6eeff1d1ee3d366481f2d2bce0aa7948be1672090 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 4 Jul 2007 23:18:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=6 --- pciutils-2.2.5.tar.bz2 | 3 -- ....5-class.diff => pciutils-2.2.6-class.diff | 0 ....5-strip.diff => pciutils-2.2.6-strip.diff | 2 +- pciutils-2.2.6.tar.bz2 | 3 ++ pciutils.changes | 9 +++++ pciutils.spec | 12 ++++-- update-pciutils-dist | 39 ++++++++----------- 7 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 pciutils-2.2.5.tar.bz2 rename pciutils-2.2.5-class.diff => pciutils-2.2.6-class.diff (100%) rename pciutils-2.2.5-strip.diff => pciutils-2.2.6-strip.diff (96%) create mode 100644 pciutils-2.2.6.tar.bz2 diff --git a/pciutils-2.2.5.tar.bz2 b/pciutils-2.2.5.tar.bz2 deleted file mode 100644 index 4777724..0000000 --- a/pciutils-2.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:178070815bd52e08aaafad533e37a47f6fa8ed81edbcbfe7700cc5d055ab8afe -size 204718 diff --git a/pciutils-2.2.5-class.diff b/pciutils-2.2.6-class.diff similarity index 100% rename from pciutils-2.2.5-class.diff rename to pciutils-2.2.6-class.diff diff --git a/pciutils-2.2.5-strip.diff b/pciutils-2.2.6-strip.diff similarity index 96% rename from pciutils-2.2.5-strip.diff rename to pciutils-2.2.6-strip.diff index a0c660c..b6a34f9 100644 --- a/pciutils-2.2.5-strip.diff +++ b/pciutils-2.2.6-strip.diff @@ -1,6 +1,6 @@ --- Makefile +++ Makefile -@@ -58,7 +58,7 @@ +@@ -63,7 +63,7 @@ install: all # -c is ignored on Linux, but required on FreeBSD $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 diff --git a/pciutils-2.2.6.tar.bz2 b/pciutils-2.2.6.tar.bz2 new file mode 100644 index 0000000..70c6b1f --- /dev/null +++ b/pciutils-2.2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:326e9089355571cce20c60ff8a7b73556daf93e717c0d338d34c32c34bab8022 +size 205033 diff --git a/pciutils.changes b/pciutils.changes index a6d826a..9f67b2c 100644 --- a/pciutils.changes +++ b/pciutils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 3 08:29:53 CEST 2007 - anicka@suse.cz + +- update to 2.2.6 + * Makefile: Added an "install-lib" target. + * Makefile, lib/Makefile: Generate and install pkg-config file + for libpci. + * lib/i386-io-hurd.h: Rewritten for new Hurd kernels. + ------------------------------------------------------------------- Fri May 4 20:41:39 CEST 2007 - anicka@suse.cz diff --git a/pciutils.spec b/pciutils.spec index 98875f8..cb925e9 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,5 +1,5 @@ # -# spec file for package pciutils (Version 2.2.5) +# spec file for package pciutils (Version 2.2.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: pciutils BuildRequires: zlib-devel -Version: 2.2.5 +Version: 2.2.6 Release: 1 Requires: pciutils-ids Autoreqprov: on Group: Hardware/Other -License: GNU General Public License (GPL) +License: GPL v2 or later Summary: PCI-utilities for Kernel version 2.2 and newer URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml Source: %{name}-%{version}.tar.bz2 @@ -92,6 +92,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libpci.a %changelog +* Tue Jul 03 2007 - anicka@suse.cz +- update to 2.2.6 + * Makefile: Added an "install-lib" target. + * Makefile, lib/Makefile: Generate and install pkg-config file + for libpci. + * lib/i386-io-hurd.h: Rewritten for new Hurd kernels. * Fri May 04 2007 - anicka@suse.cz - update to 2.2.5 * pci.ids: Updated to the current snapshot of the database. diff --git a/update-pciutils-dist b/update-pciutils-dist index 07a3f2e..2687aec 100644 --- a/update-pciutils-dist +++ b/update-pciutils-dist @@ -1,9 +1,19 @@ Index: pciutils-2.2.4/update-pciids.sh -=================================================================== ---- pciutils-2.2.4.orig/update-pciids.sh -+++ pciutils-2.2.4/update-pciids.sh -@@ -1,9 +1,9 @@ - #!/bin/sh +================================================================================ +--- pciutils-2.2.6/Makefile ++++ pciutils-2.2.6/Makefile +@@ -47,7 +47,7 @@ + common.o: common.c pciutils.h $(PCIINC) + + update-pciids: update-pciids.sh +- sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@" ++ sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@" + chmod +x $@ + + %.8: %.man +--- pciutils-2.2.6/update-pciids.sh ++++ pciutils-2.2.6/update-pciids.sh +@@ -2,7 +2,7 @@ set -e SRC="http://pciids.sourceforge.net/v2.2/pci.ids" @@ -12,9 +22,7 @@ Index: pciutils-2.2.4/update-pciids.sh PCI_COMPRESSED_IDS= GREP=grep - if [ -n "$PCI_COMPRESSED_IDS" ] ; then -@@ -53,6 +53,12 @@ if [ -f $DEST ] ; then - chmod -f --reference=$DEST.old $DEST.neww 2>/dev/null || true +@@ -54,5 +54,11 @@ fi mv $DEST.neww $DEST rm $DEST.new @@ -26,18 +34,3 @@ Index: pciutils-2.2.4/update-pciids.sh +fi echo "Done." -Index: pciutils-2.2.4/Makefile -=================================================================== ---- pciutils-2.2.4.orig/Makefile -+++ pciutils-2.2.4/Makefile -@@ -41,9 +41,9 @@ lspci.o: lspci.c pciutils.h $(PCIINC) - setpci.o: setpci.c pciutils.h $(PCIINC) - common.o: common.c pciutils.h $(PCIINC) - - update-pciids: update-pciids.sh -- sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@" -+ sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@" - chmod +x $@ - - %.8: %.man - M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#"