rpms/pciutils/F-11 pciutils-3.0.2-multilib.patch, 1.3, 1.4 pciutils.spec, 1.75, 1.76

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25382

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Log Message:
* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
- fix build to enable -F option (#531020)
- enable direct hardware access method for 64bit architectures


pciutils-3.0.2-multilib.patch:
 configure |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 11 deletions(-)

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pciutils-3.0.2-multilib.patch	27 Jan 2009 17:26:44 -0000	1.3
+++ pciutils-3.0.2-multilib.patch	26 Oct 2009 16:30:43 -0000	1.4
@@ -1,7 +1,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/^\([^-]*\)-\([^
+diff -up pciutils-3.1.4/lib/configure.multilib pciutils-3.1.4/lib/configure
+--- pciutils-3.1.4/lib/configure.multilib	2009-08-10 16:28:53.000000000 +0200
++++ pciutils-3.1.4/lib/configure	2009-10-23 17:51:57.272127815 +0200
+@@ -50,29 +50,64 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
  echo " $host $rel $cpu $sys"
  
  c=config.h
@@ -15,8 +15,10 @@ diff -up pciutils-3.0.2/lib/configure.mu
 +#define PCI_CONFIG_H
 +#if defined(__x86_64__)
 +#define PCI_ARCH_X86_64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__ia64__)
 +#define PCI_ARCH_IA64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__i386__)
 +#define PCI_ARCH_I386
 +#define PCI_HAVE_PM_INTEL_CONF
@@ -74,16 +76,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  		;;
  	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
+@@ -153,6 +188,7 @@ else
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi
  echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
@@ -91,7 +84,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  
  echo_n "Checking for DNS support... "
  if [ "$DNS" = yes -o "$DNS" = no ] ; then
-@@ -160,6 +194,7 @@ else
+@@ -167,6 +203,7 @@ else
  fi
  if [ "$DNS" = yes ] ; then
  	echo >>$c "#define PCI_USE_DNS"
@@ -99,7 +92,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  	echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
  	echo >>$m "WITH_LIBS+=$LIBRESOLV"
  fi
-@@ -182,4 +217,5 @@ fi
+@@ -189,4 +226,5 @@ fi
  echo >>$m 'PCILIBPC=$(LIBNAME).pc'
  
  echo >>$c "#define PCILIB_VERSION \"$VERSION\""


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/pciutils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- pciutils.spec	1 Sep 2009 12:03:50 -0000	1.75
+++ pciutils.spec	26 Oct 2009 16:30:44 -0000	1.76
@@ -1,16 +1,31 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
+
+#truncate too long names (#205948)
 Patch1: 	pciutils-2.2.4-buf.patch
+
+#don't segfault on systems without PCI bus (#84146)
 Patch2:		pciutils-2.1.10-scan.patch
+
+#use pread/pwrite, ifdef check is obsolete nowadays
 Patch3: 	pciutils-havepread.patch
+
+#change pci.ids directory to hwdata
 Patch6: 	pciutils-2.2.1-idpath.patch
+
+#multilib support
 Patch8: 	pciutils-3.0.2-multilib.patch
+
+#add support for directory with another pci.ids
 Patch9: 	pciutils-dir-d.patch
+
+#platform support 3x
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
 Patch12:	pciutils-3.1.2-arm.patch
+
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,7 +70,7 @@ devices connected to the PCI bus.
 %patch11 -p1 -b .superh
 %patch12 -p1 -b .arm
 
-sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
+sed -i -e 's|^SRC=.*|SRC="http://pciids.sourceforge.net/pci.ids"|' update-pciids.sh
 
 %build
 make SHARED="no" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
@@ -114,6 +129,10 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
+- fix build to enable -F option (#531020)
+- enable direct hardware access method for 64bit architectures
+
 * Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-2
 - add COPYING to docs