rpms/pciutils/devel pciutils-2.2.9-multilib.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 pciutils.spec, 1.49, 1.50 sources, 1.13, 1.14 pciutils-2.2.4-multilib.patch, 1.3, NONE
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Tue Nov 20 09:40:04 UTC 2007
Author: harald
Update of /cvs/pkgs/rpms/pciutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12327
Modified Files:
.cvsignore pciutils.spec sources
Added Files:
pciutils-2.2.9-multilib.patch
Removed Files:
pciutils-2.2.4-multilib.patch
Log Message:
* Tue Nov 20 2007 Harald Hoyer <harald at redhat.com> - 2.2.9-1
- version 2.2.9
- added package config file (rhbz#389451)
pciutils-2.2.9-multilib.patch:
--- NEW FILE pciutils-2.2.9-multilib.patch ---
diff -up pciutils-2.2.9/lib/configure.multilib pciutils-2.2.9/lib/configure
--- pciutils-2.2.9/lib/configure.multilib 2007-10-19 15:38:23.000000000 +0200
+++ pciutils-2.2.9/lib/configure 2007-11-20 10:32:57.000000000 +0100
@@ -36,75 +36,62 @@ echo " $host $rel"
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]'`"
-rm -f $m
+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
+
+#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 $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"
-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 is 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 >>$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 +114,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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 27 Jun 2007 09:51:24 -0000 1.13
+++ .cvsignore 20 Nov 2007 09:39:30 -0000 1.14
@@ -1 +1 @@
-pciutils-2.2.6.tar.gz
+pciutils-2.2.9.tar.gz
Index: pciutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pciutils.spec 22 Aug 2007 11:02:35 -0000 1.49
+++ pciutils.spec 20 Nov 2007 09:39:30 -0000 1.50
@@ -1,6 +1,6 @@
Name: pciutils
-Version: 2.2.6
-Release: 3%{?dist}
+Version: 2.2.9
+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.4-multilib.patch
+Patch8: pciutils-2.2.9-multilib.patch
License: GPLv2+
URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +50,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{sbin,%{_mandir}/man8,%{_libdir},%{_includedir}/pci}
+install -d $RPM_BUILD_ROOT/{sbin,%{_mandir}/man8,%{_libdir},%{_libdir}/pkgconfig,%{_includedir}/pci}
install lspci setpci update-pciids $RPM_BUILD_ROOT/sbin
install lspci.8 setpci.8 update-pciids.8 $RPM_BUILD_ROOT%{_mandir}/man8
@@ -59,6 +59,7 @@
install lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci
install lib/config.h $RPM_BUILD_ROOT%{_includedir}/pci
install lib/types.h $RPM_BUILD_ROOT%{_includedir}/pci
+install lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%files
%defattr(0644, root, root, 0755)
@@ -69,12 +70,17 @@
%files devel
%defattr(0644, root, root, 0755)
%{_libdir}/libpci.a
+%{_libdir}/pkgconfig/libpci.pc
%{_includedir}/pci
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 20 2007 Harald Hoyer <harald at redhat.com> - 2.2.9-1
+- version 2.2.9
+- added package config file (rhbz#389451)
+
* Wed Aug 22 2007 Harald Hoyer <harald at redhat.com> - 2.2.6-3
- changed license tag
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 27 Jun 2007 09:51:24 -0000 1.13
+++ sources 20 Nov 2007 09:39:30 -0000 1.14
@@ -1 +1 @@
-e26593ab38ef9ae4457826be9e35aff8 pciutils-2.2.6.tar.gz
+b3700c60b8b341b593d3c3f274caefb3 pciutils-2.2.9.tar.gz
--- pciutils-2.2.4-multilib.patch DELETED ---
More information about the fedora-extras-commits
mailing list