rpms/pciutils/devel pciutils-2.2.4-multilib.patch, 1.2, 1.3 pciutils.spec, 1.45, 1.46

[Harald Hoyer (harald)]

Author: harald

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

Modified Files:
	pciutils-2.2.4-multilib.patch pciutils.spec 
Log Message:
version 2.2.4

pciutils-2.2.4-multilib.patch:

Index: pciutils-2.2.4-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-2.2.4-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pciutils-2.2.4-multilib.patch	2 Apr 2007 09:55:47 -0000	1.2
+++ pciutils-2.2.4-multilib.patch	31 May 2007 10:32:51 -0000	1.3
@@ -1,13 +1,13 @@
---- pciutils-2.2.4/lib/configure.multilib	2006-09-09 13:06:10.000000000 +0200
-+++ pciutils-2.2.4/lib/configure	2007-04-02 11:49:55.000000000 +0200
-@@ -35,74 +35,62 @@
+--- pciutils-2.2.5/lib/configure.multilib	2007-02-06 12:58:14.000000000 +0100
++++ pciutils-2.2.5/lib/configure	2007-05-31 12:27:33.000000000 +0200
+@@ -36,75 +36,62 @@
  zlib=$5
  
  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 >$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
 +cat >$c <<EOF
 +#if defined(__x86_64__)
@@ -73,6 +73,7 @@
 -						exit 1
 -						;;
 -		esac
+-		echo >>$c '#define PCI_HAVE_STDINT_H'
 -		;;
 -	freebsd)
 -		echo_n " fbsd-device"
@@ -124,7 +125,7 @@
  echo " dump"
  
  echo_n "Checking for zlib support... "
-@@ -124,6 +112,8 @@
+@@ -126,6 +113,8 @@
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi
  echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\""


Index: pciutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pciutils.spec	5 Apr 2007 20:09:14 -0000	1.45
+++ pciutils.spec	31 May 2007 10:32:51 -0000	1.46
@@ -1,6 +1,6 @@
 Name:		pciutils
-Version:	2.2.4
-Release: 	3%{?dist}
+Version:	2.2.5
+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
@@ -74,6 +74,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu May 31 2007 Harald Hoyer <harald at redhat.com> - 2.2.5-1
+- version 2.2.5
+
 * Thu Apr  5 2007 Peter Jones <pjones at redhat.com> - 2.2.4-3
 - buildreq zlib-devel, so we know configure will find it consistently.