diff --git a/.cvsignore b/.cvsignore index 5b4e9f2..2d3aaa0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pciutils-2.2.9.tar.gz +pciutils-2.2.10.tar.gz diff --git a/pciutils-2.2.9-multilib.patch b/pciutils-2.2.10-multilib.patch similarity index 88% rename from pciutils-2.2.9-multilib.patch rename to pciutils-2.2.10-multilib.patch index d3ec9f0..facf6b7 100644 --- a/pciutils-2.2.9-multilib.patch +++ b/pciutils-2.2.10-multilib.patch @@ -1,15 +1,15 @@ -diff -up pciutils-2.2.9/lib/configure.multilib pciutils-2.2.9/lib/configure ---- pciutils-2.2.9/lib/configure.multilib 2007-10-19 15:38:23.000000000 +0200 -+++ pciutils-2.2.9/lib/configure 2007-11-20 10:32:57.000000000 +0100 -@@ -36,75 +36,62 @@ echo " $host $rel" - zlib=$5 +diff -up pciutils-2.2.10/lib/configure.multilib pciutils-2.2.10/lib/configure +--- pciutils-2.2.10/lib/configure.multilib 2008-02-11 21:04:18.000000000 +0100 ++++ pciutils-2.2.10/lib/configure 2008-02-20 11:04:18.000000000 +0100 +@@ -37,74 +37,60 @@ zlib=$5 c=config.h -+cm=config.h.mk m=config.mk -echo >$c "#define PCI_ARCH_`echo $cpu | tr '[a-z]' '[A-Z]'`" -echo >>$c "#define PCI_OS_`echo $sys | tr '[a-z]' '[A-Z]'`" -rm -f $m + ++cm=config.h.mk +cat >$c <$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`" -+#echo >>$c "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`" +rm -f $cm +echo >$cm "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`" +echo >>$cm "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`" - ++ echo_n "Looking for access methods..." -+echo_n " sysfs proc" - +- -case $sys in - linux*) - echo_n " sysfs proc" @@ -70,7 +67,7 @@ diff -up pciutils-2.2.9/lib/configure.multilib pciutils-2.2.9/lib/configure - echo >>$c "#define PCI_HAVE_PM_INTEL_CONF" - ;; - *) -- echo " The PCI library is does not support Solaris for this architecture: $cpu" +- echo " The PCI library does not support Solaris for this architecture: $cpu" - exit 1 - ;; - esac @@ -108,6 +105,8 @@ diff -up pciutils-2.2.9/lib/configure.multilib pciutils-2.2.9/lib/configure - echo " Unfortunately, your OS is not supported by the PCI Library" - exit 1 - ;; ++echo_n " sysfs proc" ++ +echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS' +echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC' +echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H' @@ -118,15 +117,15 @@ diff -up pciutils-2.2.9/lib/configure.multilib pciutils-2.2.9/lib/configure + echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF' + ;; esac + +echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS' + - echo >>$c '#define PCI_HAVE_PM_DUMP' +echo >>$cm '#define PCI_HAVE_PM_DUMP' echo " dump" echo_n "Checking for zlib support... " -@@ -127,6 +114,8 @@ else +@@ -127,6 +113,8 @@ else echo >>$c '#define PCI_IDS "pci.ids"' fi echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\"" diff --git a/pciutils.spec b/pciutils.spec index cb60ca0..98144bb 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,6 +1,6 @@ Name: pciutils -Version: 2.2.9 -Release: 6%{?dist} +Version: 2.2.10 +Release: 1%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Patch0: pciutils-strip.patch Patch1: pciutils-2.2.4-buf.patch @@ -8,7 +8,7 @@ Patch2: pciutils-2.1.10-scan.patch Patch3: pciutils-havepread.patch Patch6: pciutils-2.2.1-idpath.patch Patch7: pciutils-2.1.99-gcc4.patch -Patch8: pciutils-2.2.9-multilib.patch +Patch8: pciutils-2.2.10-multilib.patch Patch9: pciutils-dir-d.patch License: GPLv2+ URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml @@ -79,6 +79,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 20 2008 Harald Hoyer 2.2.10-1 +- version 2.2.10 + * Mon Feb 18 2008 Fedora Release Engineering - 2.2.9-6 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index a16b4d3..c3a44d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3700c60b8b341b593d3c3f274caefb3 pciutils-2.2.9.tar.gz +808e1356ea7a288237371fdecba3f689 pciutils-2.2.10.tar.gz