diff --git a/.cvsignore b/.cvsignore index 50f0d89..5b4e9f2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pciutils-2.2.6.tar.gz +pciutils-2.2.9.tar.gz diff --git a/pciutils-2.2.4-multilib.patch b/pciutils-2.2.9-multilib.patch similarity index 92% rename from pciutils-2.2.4-multilib.patch rename to pciutils-2.2.9-multilib.patch index 9d4d225..d3ec9f0 100644 --- a/pciutils-2.2.4-multilib.patch +++ b/pciutils-2.2.9-multilib.patch @@ -1,6 +1,7 @@ ---- 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 @@ +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 @@ -97,7 +98,7 @@ - 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 'LDFLAGS+=-lpci' +- echo >>$m 'LDLIBS+=-lpci' - ;; - gnu) - echo_n " i386-ports" @@ -125,7 +126,7 @@ echo " dump" echo_n "Checking for zlib support... " -@@ -126,6 +113,8 @@ +@@ -127,6 +114,8 @@ else echo >>$c '#define PCI_IDS "pci.ids"' fi echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\"" diff --git a/pciutils.spec b/pciutils.spec index 8753013..00f7d76 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -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 @@ Patch2: pciutils-2.1.10-scan.patch 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 @@ make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdat %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/pci.h $RPM_BUILD_ROOT%{_includedir}/pci 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 @@ install lib/types.h $RPM_BUILD_ROOT%{_includedir}/pci %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 - 2.2.9-1 +- version 2.2.9 +- added package config file (rhbz#389451) + * Wed Aug 22 2007 Harald Hoyer - 2.2.6-3 - changed license tag diff --git a/sources b/sources index 8eea85c..a16b4d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e26593ab38ef9ae4457826be9e35aff8 pciutils-2.2.6.tar.gz +b3700c60b8b341b593d3c3f274caefb3 pciutils-2.2.9.tar.gz