rpms/pciutils/F-9 pciutils-2.2.10-wget-timestamping.patch, NONE, 1.1 pciutils-3.0.1-superh-support.patch, NONE, 1.1 pciutils.spec, 1.59, 1.60

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-2.2.10-wget-timestamping.patch 
	pciutils-3.0.1-superh-support.patch 
Log Message:
support Super-H (#446600), fix: wget timestamping (#441946), broken -L in libpci.pc (#456469)


pciutils-2.2.10-wget-timestamping.patch:

--- NEW FILE pciutils-2.2.10-wget-timestamping.patch ---
diff -up pciutils-2.2.10/update-pciids.sh.wget-timestamping pciutils-2.2.10/update-pciids.sh
--- pciutils-2.2.10/update-pciids.sh.wget-timestamping	2008-09-22 11:31:22.000000000 +0200
+++ pciutils-2.2.10/update-pciids.sh	2008-09-22 11:39:11.102527588 +0200
@@ -33,7 +33,7 @@ if which curl >/dev/null 2>&1 ; then
 	DL="curl -o $DEST.new $SRC"
     ${quiet} && DL="$DL -s -S"
 elif which wget >/dev/null 2>&1 ; then
-	DL="wget -O $DEST.new $SRC"
+	DL="wget -no-timestamping -O $DEST.new $SRC"
 	${quiet} && DL="$DL -q"
 elif which lynx >/dev/null 2>&1 ; then
 	DL="eval lynx -source $SRC >$DEST.new"

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-9/pciutils.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- pciutils.spec	27 May 2008 00:07:03 -0000	1.59
+++ pciutils.spec	22 Sep 2008 10:01:57 -0000	1.60
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.10
-Release: 	2%{?dist}
+Release: 	3%{?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
@@ -11,6 +11,9 @@
 Patch8: 	pciutils-2.2.10-multilib.patch
 Patch9: 	pciutils-dir-d.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.10-wget-timestamping.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,11 +49,18 @@
 %patch8 -p1 -b .multilib
 %patch9 -p1 -b .dird
 %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
@@ -81,6 +91,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 22 2008 Michal Hlavinka <mhlavink at redhat.com> 2.2.10-3
+- 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)
+
 * Mon May 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
 - add sparc support