- removed obsolete patches
This commit is contained in:
Michal Hlavinka
parent
6501a74733
commit
f4d0b14dd3
@ -1,14 +0,0 @@
|
||||
diff -up pciutils-3.0.0/lib/configure.sparc pciutils-3.0.0/lib/configure
|
||||
--- pciutils-3.0.0/lib/configure.sparc 2008-09-01 15:17:44.000000000 +0200
|
||||
+++ pciutils-3.0.0/lib/configure 2008-09-01 15:17:44.000000000 +0200
|
||||
@@ -62,6 +62,10 @@ define PCI_ARCH_S390X
|
||||
#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
|
||||
@ -1,12 +0,0 @@
|
||||
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
|
||||
@ -1,102 +0,0 @@
|
||||
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
|
||||
+cm=config.h.mk
|
||||
m=config.mk
|
||||
-echo >$c '#define PCI_CONFIG_H'
|
||||
-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 >$m 'WITH_LIBS='
|
||||
+cat >$c <<EOF
|
||||
+#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
|
||||
+#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..."
|
||||
+echo_n " sysfs proc"
|
||||
LIBRESOLV=-lresolv
|
||||
|
||||
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"'
|
||||
+ 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
|
||||
i?86|x86_64) echo_n " i386-ports"
|
||||
- echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
|
||||
+ echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
|
||||
;;
|
||||
esac
|
||||
- echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
|
||||
+ echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS'
|
||||
;;
|
||||
sunos)
|
||||
case $cpu in
|
||||
@@ -153,6 +188,7 @@ else
|
||||
echo >>$c '#define PCI_IDS "pci.ids"'
|
||||
fi
|
||||
echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
|
||||
+echo >>$cm "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
|
||||
|
||||
echo_n "Checking for DNS support... "
|
||||
if [ "$DNS" = yes -o "$DNS" = no ] ; then
|
||||
@@ -167,6 +203,7 @@ else
|
||||
fi
|
||||
if [ "$DNS" = yes ] ; then
|
||||
echo >>$c "#define PCI_USE_DNS"
|
||||
+ echo >>$cm "#define PCI_USE_DNS"
|
||||
echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
|
||||
echo >>$m "WITH_LIBS+=$LIBRESOLV"
|
||||
fi
|
||||
@@ -189,4 +226,5 @@ fi
|
||||
echo >>$m 'PCILIBPC=$(LIBNAME).pc'
|
||||
|
||||
echo >>$c "#define PCILIB_VERSION \"$VERSION\""
|
||||
-sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m
|
||||
+echo >>$cm "#define PCILIB_VERSION \"$VERSION\""
|
||||
+sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$cm >>$m
|
||||
\ No newline at end of file
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up pciutils-3.0.2/lib/configure.arm pciutils-3.0.2/lib/configure
|
||||
--- pciutils-3.0.2/lib/configure.arm 2009-04-29 16:58:54.097763684 +0200
|
||||
+++ pciutils-3.0.2/lib/configure 2009-04-29 17:16:50.442420669 +0200
|
||||
@@ -26,7 +26,7 @@ if [ -z "$HOST" ] ; then
|
||||
proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
|
||||
cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
|
||||
else
|
||||
- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
|
||||
+ cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^arm.*$/arm/'`
|
||||
fi
|
||||
if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
|
||||
then
|
||||
@@ -73,6 +73,8 @@ cat >$c <<EOF
|
||||
#define PCI_ARCH_SPARC
|
||||
#elif defined(__sh__)
|
||||
#define PCI_ARCH_SH
|
||||
+#elif defined(__arm__)
|
||||
+#define PCI_ARCH_ARM
|
||||
#else
|
||||
#error Unknown Arch
|
||||
#endif
|
||||
@ -1,6 +1,6 @@
|
||||
Name: pciutils
|
||||
Version: 3.1.7
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
|
||||
|
||||
#truncate too long names (#205948)
|
||||
@ -15,17 +15,9 @@ Patch3: pciutils-havepread.patch
|
||||
#change pci.ids directory to hwdata, fedora/rhel specific
|
||||
Patch6: pciutils-2.2.1-idpath.patch
|
||||
|
||||
#multilib support
|
||||
Patch8: pciutils-3.0.2-multilib.patch
|
||||
|
||||
#add support for directory with another pci.ids, rejected by upstream, rhbz#195327
|
||||
Patch9: pciutils-dir-d.patch
|
||||
|
||||
#platform support 3x
|
||||
Patch10: pciutils-2.2.10-sparc-support.patch
|
||||
Patch11: pciutils-3.0.1-superh-support.patch
|
||||
Patch12: pciutils-3.1.2-arm.patch
|
||||
|
||||
License: GPLv2+
|
||||
URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -73,11 +65,7 @@ devices connected to the PCI bus.
|
||||
%patch2 -p1 -b .scan
|
||||
%patch3 -p1 -b .pread
|
||||
%patch6 -p1 -b .idpath
|
||||
%patch8 -p1 -b .multilib
|
||||
%patch9 -p1 -b .dird
|
||||
%patch10 -p1 -b .sparc
|
||||
%patch11 -p1 -b .superh
|
||||
%patch12 -p1 -b .arm
|
||||
|
||||
sed -i -e 's|^SRC=.*|SRC="http://pciids.sourceforge.net/pci.ids"|' update-pciids.sh
|
||||
|
||||
@ -144,6 +132,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Mon Jan 10 2011 Michal Hlavinka <mhlavink@redhat.com> - 3.1.7-2
|
||||
- removed obsolete patches
|
||||
|
||||
* Mon Aug 30 2010 Michal Hlavinka <mhlavink@redhat.com> - 3.1.7-1
|
||||
- updated to 3.1.7
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user