rpms/pciutils/devel pciutils-2.2.10-multilib.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 pciutils.spec, 1.57, 1.58 sources, 1.14, 1.15 pciutils-2.2.9-multilib.patch, 1.1, NONE

Harald Hoyer (harald) fedora-extras-commits at redhat.com
Wed Feb 20 10:08:45 UTC 2008 

Author: harald

Update of /cvs/pkgs/rpms/pciutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3510

Modified Files:
	.cvsignore pciutils.spec sources 
Added Files:
	pciutils-2.2.10-multilib.patch 
Removed Files:
	pciutils-2.2.9-multilib.patch 
Log Message:
* Wed Feb 20 2008 Harald Hoyer <harald at redhat.com> 2.2.10-1
- version 2.2.10


pciutils-2.2.10-multilib.patch:

--- NEW FILE pciutils-2.2.10-multilib.patch ---
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
 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 <<EOF
+#if defined(__x86_64__)
+#define PCI_ARCH_X86_64
+#elif defined(__ia64__)
+#define PCI_ARCH_IA64
+#elif defined(__i386__)
+#define PCI_ARCH_I386
+#define PCI_HAVE_PM_INTEL_CONF
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#define PCI_ARCH_PPC64
+#elif defined(__ppc__)  || defined(__powerpc__)
+#define PCI_ARCH_PPC
+#elif defined(__s390x__)
+#define PCI_ARCH_S390X
+#elif defined(__s390__)
+#define PCI_ARCH_S390
+#elif defined(__alpha__)
+#define PCI_ARCH_ALPHA
+#else
+#error Unknown Arch
+#endif
+#define PCI_OS_LINUX
+#define PCI_HAVE_PM_LINUX_SYSFS
+#define PCI_HAVE_PM_LINUX_PROC
+#define PCI_HAVE_LINUX_BYTEORDER_H
+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
+#define PCI_HAVE_64BIT_ADDRESS
+EOF
+
+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..."
-
-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"'
-		case $cpu in
-				i386)		echo_n " i386-ports"
-						echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
-						;;
-		esac
-		echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
-		;;
-	sunos)
-		case $cpu in
-				i386)		echo_n " i386-ports"
-						echo >>$c "#define PCI_HAVE_PM_INTEL_CONF"
-						;;
-				*)
-						echo " The PCI library does not support Solaris for this architecture: $cpu"
-						exit 1
-						;;
-		esac
-		echo >>$c '#define PCI_HAVE_STDINT_H'
-		;;
-	freebsd)
-		echo_n " fbsd-device"
-		echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
-		echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
-		;;
-        openbsd)
-	        echo_n " obsd-device"
-		echo >>$c '#define PCI_HAVE_PM_OBSD_DEVICE'
-		echo >>$c '#define PCI_PATH_OBSD_DEVICE "/dev/pci"'
-		;;
-	aix)
-		echo_n " aix-device"
-		echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE'
-		echo >>$m 'CFLAGS=-g'
-		echo >>$m 'INSTALL=installbsd'
-		echo >>$m 'DIRINSTALL=mkdir -p'
-		;;
-	netbsd)
-		echo_n " nbsd-libpci"
-		echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI'
-		echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"'
-		echo >>$m 'PCILIB=lib/libpciutils.a'
-		echo >>$m 'LDLIBS+=-lpci'
-		;;
-    	gnu)
-		echo_n " i386-ports"
-		echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
-		;;
-        *)
-		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'
+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)		echo_n " i386-ports"
+	        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 +113,8 @@ else
 	echo >>$c '#define PCI_IDS "pci.ids"'
 fi
 echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\""
-
 echo >>$c "#define PCILIB_VERSION \"$version\""
-sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m
+echo >>$cm "#define PCI_PATH_IDS_DIR \"$idsdir\""
+echo >>$cm "#define PCILIB_VERSION \"$version\""
+#sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m
+sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$cm >>$m


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Nov 2007 09:39:30 -0000	1.14
+++ .cvsignore	20 Feb 2008 10:07:58 -0000	1.15
@@ -1 +1 @@
-pciutils-2.2.9.tar.gz
+pciutils-2.2.10.tar.gz


Index: pciutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- pciutils.spec	19 Feb 2008 04:38:24 -0000	1.57
+++ pciutils.spec	20 Feb 2008 10:07:58 -0000	1.58
@@ -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 @@
 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 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 20 2008 Harald Hoyer <harald at redhat.com> 2.2.10-1
+- version 2.2.10
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.9-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Nov 2007 09:39:30 -0000	1.14
+++ sources	20 Feb 2008 10:07:58 -0000	1.15
@@ -1 +1 @@
-b3700c60b8b341b593d3c3f274caefb3  pciutils-2.2.9.tar.gz
+808e1356ea7a288237371fdecba3f689  pciutils-2.2.10.tar.gz


--- pciutils-2.2.9-multilib.patch DELETED ---

More information about the fedora-extras-commits mailing list