diff --git a/.cvsignore b/.cvsignore index 3a7ae4b..5884c2f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pciutils-3.0.2.tar.gz +pciutils-3.0.3.tar.gz diff --git a/pciutils-3.0.0-multilib.patch b/pciutils-3.0.0-multilib.patch deleted file mode 100644 index fd5af0b..0000000 --- a/pciutils-3.0.0-multilib.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -up pciutils-3.0.0/lib/configure.multilib pciutils-3.0.0/lib/configure ---- pciutils-3.0.0/lib/configure.multilib 2008-04-10 21:15:47.000000000 +0200 -+++ pciutils-3.0.0/lib/configure 2008-09-01 15:17:03.000000000 +0200 -@@ -41,28 +41,61 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^ - echo " $host $rel" - - 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]'`" - echo >$m 'WITH_LIBS=' -+cat >$c <$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" -- echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS' -- echo >>$c '#define PCI_HAVE_PM_LINUX_PROC' -- echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H' -- echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"' -- echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"' -+ echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS' -+ echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC' -+ echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H' -+ echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"' -+ echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"' - case $cpu in - i386|x86_64) echo_n " i386-ports" -- echo >>$c '#define PCI_HAVE_PM_INTEL_CONF' -+ echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF' - ;; - esac -- echo >>$c '#define PCI_HAVE_64BIT_ADDRESS' -- echo >>$c '#define PCI_USE_DNS' -+ echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS' -+ echo >>$cm '#define PCI_USE_DNS' - ;; - sunos) - case $cpu in -@@ -110,7 +143,7 @@ case $sys in - ;; - esac - --echo >>$c '#define PCI_HAVE_PM_DUMP' -+echo >>$cm '#define PCI_HAVE_PM_DUMP' - echo " dump" - - echo_n "Checking for zlib support... " -@@ -133,6 +166,7 @@ else - echo >>$c '#define PCI_IDS "pci.ids"' - fi - echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\"" -+echo >>$cm "#define PCI_PATH_IDS_DIR \"$IDSDIR\"" - - echo_n "Checking for DNS support... " - if [ "$DNS" = yes -o "$DNS" = no ] ; then -@@ -168,4 +202,5 @@ fi - echo >>$m 'PCILIBPC=$(LIBNAME).pc' - - echo >>$c "#define PCILIB_VERSION \"$VERSION\"" --sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m -+echo >>$cm "#define PCILIB_VERSION \"$VERSION\"" -+sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$cm >>$m -\ No newline at end of file diff --git a/pciutils-3.0.2-multilib.patch b/pciutils-3.0.2-multilib.patch index 955b1ae..23e32a4 100644 --- a/pciutils-3.0.2-multilib.patch +++ b/pciutils-3.0.2-multilib.patch @@ -2,7 +2,7 @@ diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure --- pciutils-3.0.2/lib/configure.multilib 2008-09-19 20:04:37.000000000 +0200 +++ pciutils-3.0.2/lib/configure 2008-09-22 10:35:58.964527560 +0200 @@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^ - echo " $host $rel" + echo " $host $rel $cpu $sys" c=config.h +cm=config.h.mk @@ -64,7 +64,7 @@ diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure + echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"' + echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"' case $cpu in - i386|x86_64) echo_n " i386-ports" + i?86|x86_64) echo_n " i386-ports" - echo >>$c '#define PCI_HAVE_PM_INTEL_CONF' + echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF' ;; diff --git a/pciutils.spec b/pciutils.spec index 5db2b03..becb5d2 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,5 +1,5 @@ Name: pciutils -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Patch1: pciutils-2.2.4-buf.patch @@ -114,7 +114,10 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf $RPM_BUILD_ROOT %changelog -* Mon Sep 22 2008 Michal Hlavinka 3.0.1-1 +* Tue Dec 09 2008 Michal Hlavinka 3.0.3-1 +- version 3.0.3 + +* Mon Sep 22 2008 Michal Hlavinka 3.0.2-1 - version 3.0.2 * Fri Sep 19 2008 Michal Hlavinka 3.0.1-1 diff --git a/sources b/sources index aa7fa6f..4090929 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11ccb3cfd12d0ac7bc2e3839b0c3f807 pciutils-3.0.2.tar.gz +d07da501bb11e6af40acd036536c2e9a pciutils-3.0.3.tar.gz