rpms/pciutils/F-12 pciutils-3.0.2-multilib.patch, 1.3, 1.4 pciutils.spec, 1.78, 1.79 pciutils-2.2.10-multilib.patch, 1.1, NONE

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Removed Files:
	pciutils-2.2.10-multilib.patch 
Log Message:
* Fri Oct 23 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
- use direct hardware access method for 64bit architectures


pciutils-3.0.2-multilib.patch:
 configure |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 12 deletions(-)

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/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	23 Oct 2009 15:57:45 -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,7 +76,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  		;;
  	sunos)
  		case $cpu in
-@@ -123,7 +156,7 @@ case $sys in
+@@ -130,7 +165,7 @@ case $sys in
  		;;
  esac
  
@@ -83,7 +85,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  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 +93,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 +101,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-12/pciutils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- pciutils.spec	12 Oct 2009 13:29:09 -0000	1.78
+++ pciutils.spec	23 Oct 2009 15:57:45 -0000	1.79
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 
 #truncate too long names (#205948)
@@ -140,6 +140,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Oct 23 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
+- use direct hardware access method for 64bit architectures
+
 * Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
 - don't ship static library in -devel sub-package
 


--- pciutils-2.2.10-multilib.patch DELETED ---