rpms/pciutils/F-8 pciutils-2.2.10-sparc-support.patch, NONE, 1.1 pciutils-2.2.9-wget-timestamping.patch, NONE, 1.1 pciutils-3.0.1-superh-support.patch, NONE, 1.1 pciutils.spec, 1.50, 1.51

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-2.2.10-sparc-support.patch 
	pciutils-2.2.9-wget-timestamping.patch 
	pciutils-3.0.1-superh-support.patch 
Log Message:
fixes: broken -L in libpci.pc (#456469), timestamping=on in wgetrc (#441946), support for Super-H (sh3,sh4) (#446600)


pciutils-2.2.10-sparc-support.patch:

--- NEW FILE pciutils-2.2.10-sparc-support.patch ---
diff -up pciutils-2.2.10/lib/configure.BAD pciutils-2.2.10/lib/configure
--- pciutils-2.2.10/lib/configure.BAD	2008-05-26 18:28:51.000000000 -0500
+++ pciutils-2.2.10/lib/configure	2008-05-26 18:30:13.000000000 -0500
@@ -57,6 +57,10 @@ cat >$c <<EOF
 #define PCI_ARCH_S390
 #elif defined(__alpha__)
 #define PCI_ARCH_ALPHA
+#elif defined(__sparc__) && defined (__arch64__)
+#define PCI_ARCH_SPARC64
+#elif defined(__sparc__)
+#define PCI_ARCH_SPARC
 #else
 #error Unknown Arch
 #endif

pciutils-2.2.9-wget-timestamping.patch:

--- NEW FILE pciutils-2.2.9-wget-timestamping.patch ---
diff -up pciutils-2.2.9/update-pciids.sh.wget-timestamping pciutils-2.2.9/update-pciids.sh
--- pciutils-2.2.9/update-pciids.sh.wget-timestamping	2006-09-09 12:36:17.000000000 +0200
+++ pciutils-2.2.9/update-pciids.sh	2008-09-22 12:33:04.679529269 +0200
@@ -23,7 +23,7 @@ fi
 if which curl >/dev/null ; then
 	DL="curl -o $DEST.new $SRC"
 elif which wget >/dev/null ; then
-	DL="wget -O $DEST.new $SRC"
+	DL="wget -no-timestamping -O $DEST.new $SRC"
 elif which lynx >/dev/null ; then
 	DL="eval lynx -source $SRC >$DEST.new"
 else

pciutils-3.0.1-superh-support.patch:

--- NEW FILE pciutils-3.0.1-superh-support.patch ---
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


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-8/pciutils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pciutils.spec	4 Dec 2007 10:00:13 -0000	1.50
+++ pciutils.spec	22 Sep 2008 10:39:22 -0000	1.51
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.9
-Release: 	1%{?dist}
+Release: 	2%{?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
@@ -9,6 +9,10 @@
 Patch6: 	pciutils-2.2.1-idpath.patch
 Patch7:		pciutils-2.1.99-gcc4.patch
 Patch8: 	pciutils-2.2.9-multilib.patch
+Patch10:	pciutils-2.2.10-sparc-support.patch
+Patch11:	pciutils-3.0.1-superh-support.patch
+#backported patch from mainstream 3.0.1:
+Patch12:	pciutils-2.2.9-wget-timestamping.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,11 +46,19 @@
 %patch6 -p1 -b .idpath
 %patch7 -p1 -b .glibcmacros
 %patch8 -p1 -b .multilib
+%patch10 -p1 -b .sparc
+%patch11 -p1 -b .superh
+%patch12 -p1 -b .wgettimestamp
+
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
 %build
 make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" 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.old >lib/libpci.pc "s|^libdir=.*$|libdir=%{_libdir}|"
+rm lib/libpci.pc.old
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +89,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 22 2008 Michal Hlavinka <mhlavink at redhat.com> 2.2.9-2
+- add support for Super-H (sh3,sh4) (#446600)
+- fix: broken -L in libpci.pc (#456469)
+- fix: update-pciids broken with wget 1.11 and "timestamping = on" in wgetrc (#441946)
+
 * Tue Nov 20 2007 Harald Hoyer <harald at redhat.com> - 2.2.9-1
 - version 2.2.9
 - added package config file (rhbz#389451)