From fe715944398e5803e7df373e08dba0564418efd6 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 19 Sep 2008 10:24:41 +0000 Subject: [PATCH] version 3.0.1, bugfixes: super-h support (#446600), broken libpci.pc (#456469) --- .cvsignore | 2 +- pciutils-3.0.1-multilib.patch | 109 ++++++++++++++++++++++++++++ pciutils-3.0.1-superh-support.patch | 12 +++ pciutils.spec | 20 ++++- sources | 2 +- 5 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 pciutils-3.0.1-multilib.patch create mode 100644 pciutils-3.0.1-superh-support.patch diff --git a/.cvsignore b/.cvsignore index cb4388d..ca99b17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pciutils-3.0.0.tar.gz +pciutils-3.0.1.tar.gz diff --git a/pciutils-3.0.1-multilib.patch b/pciutils-3.0.1-multilib.patch new file mode 100644 index 0000000..5f3b514 --- /dev/null +++ b/pciutils-3.0.1-multilib.patch @@ -0,0 +1,109 @@ +diff -up pciutils-3.0.1/lib/configure.multilib pciutils-3.0.1/lib/configure +--- pciutils-3.0.1/lib/configure.multilib 2008-08-26 17:08:52.000000000 +0200 ++++ pciutils-3.0.1/lib/configure 2008-09-19 11:35:58.964527560 +0200 +@@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^ + echo " $host $rel" + + c=config.h ++cm=config.h.mk + m=config.mk +-echo >$c '#define PCI_CONFIG_H' +-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" + LIBRESOLV=-lresolv + + 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 >>$cm '#define PCI_HAVE_64BIT_ADDRESS' + ;; + sunos) + case $cpu in +@@ -123,7 +156,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... " +@@ -146,6 +179,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 +@@ -160,6 +194,7 @@ else + fi + if [ "$DNS" = yes ] ; then + echo >>$c "#define PCI_USE_DNS" ++ echo >>$cm "#define PCI_USE_DNS" + echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\"" + echo >>$m "WITH_LIBS+=$LIBRESOLV" + fi +@@ -182,4 +217,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.1-superh-support.patch b/pciutils-3.0.1-superh-support.patch new file mode 100644 index 0000000..2887cbe --- /dev/null +++ b/pciutils-3.0.1-superh-support.patch @@ -0,0 +1,12 @@ +diff -up pciutils-3.0.1/lib/configure.superh pciutils-3.0.1/lib/configure +--- pciutils-3.0.1/lib/configure.superh 2008-09-19 11:37:51.000000000 +0200 ++++ pciutils-3.0.1/lib/configure 2008-09-19 11:38:46.133527866 +0200 +@@ -71,6 +71,8 @@ define PCI_ARCH_S390X + #define PCI_ARCH_SPARC64 + #elif defined(__sparc__) + #define PCI_ARCH_SPARC ++#elif defined(__sh__) ++#define PCI_ARCH_SH + #else + #error Unknown Arch + #endif diff --git a/pciutils.spec b/pciutils.spec index 36de5f1..7cc4ba9 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,15 +1,16 @@ Name: pciutils -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Patch1: pciutils-2.2.4-buf.patch 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-3.0.0-multilib.patch +Patch8: pciutils-3.0.1-multilib.patch Patch9: pciutils-dir-d.patch Patch10: pciutils-2.2.10-sparc-support.patch +Patch11: pciutils-3.0.1-superh-support.patch License: GPLv2+ URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +53,8 @@ devices connected to the PCI bus. %patch8 -p1 -b .multilib %patch9 -p1 -b .dird %patch10 -p1 -b .sparc +%patch11 -p1 -b .superh + sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh %build @@ -62,6 +65,12 @@ make clean make SHARED="yes" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags} +#fix lib vs. lib64 in libpci.pc (static Makefile is used) +mv lib/libpci.pc lib/libpci.pc.old +sed lib/libpci.pc "s|^libdir=.*$|libdir=%{_libdir}|" +rm lib/libpci.pc.old + + %install rm -rf $RPM_BUILD_ROOT @@ -105,6 +114,11 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 19 2008 Michal Hlavinka 3.0.1-1 +- version 3.0.1 +- add support for Super-H (sh3,sh4) (#446600) +- fix: broken -L in libpci.pc (#456469) + * Mon Sep 01 2008 Harald Hoyer 3.0.0-2 - rebuild to eliminate fuzz patches diff --git a/sources b/sources index 33996d8..39c643d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba7dd55e568e2ea27b8b8cc2e3d46597 pciutils-3.0.0.tar.gz +22ebed1ecc928bab51e82b91c6be1d4e pciutils-3.0.1.tar.gz