OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=14

pciutils-3.0.0_pkgconfig.patch

@@ -0,0 +1,11 @@
+Index: lib/libpci.pc.in
+===================================================================
+--- lib/libpci.pc.in.orig	2008-04-10 21:15:47.000000000 +0200
++++ lib/libpci.pc.in	2008-04-11 16:31:23.622221413 +0200
+@@ -6,5 +6,4 @@ idsdir=@IDSDIR@
+ Name: libpci
+ Description: libpci
+ Version: @VERSION@
+-Libs: -L${libdir} -lpci @LDLIBS@
+-Cflags: -I${includedir}
++Libs: -lpci @LDLIBS@

pciutils.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr 11 16:30:15 CEST 2008 - mrueckert@suse.de
+
+- move shared libs to /%{_lib}
+- added pciutils-3.0.0_pkgconfig.patch:
+  clean up the pkgconfig file so we can include it
+- package the pkgconfig file
+
 -------------------------------------------------------------------
 Fri Apr 11 00:07:33 CEST 2008 - mrueckert@suse.de
 

pciutils.spec

@@ -14,7 +14,7 @@
 Name:           pciutils
 BuildRequires:  zlib-devel
 Version:        3.0.0 
-Release:        2
+Release:        3
 Requires:       pciutils-ids
 AutoReqProv:    on
 Group:          Hardware/Other
@@ -23,6 +23,7 @@ Summary:        PCI-utilities for Kernel version 2.2 and newer
 Url:            http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 Source:         %{name}-%{version}.tar.bz2
 Patch:          update-pciutils-dist
+Patch1:         pciutils-3.0.0_pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -62,18 +63,20 @@ Authors:
 %prep
 %setup -q
 %patch -p1
+%patch1
 
 %build
-make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} SBINDIR=/sbin STRIP="" SHARED="yes"
+make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"
 
 %install
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix} SBINDIR=$RPM_BUILD_ROOT/sbin \
              ROOT=$RPM_BUILD_ROOT/ MANDIR=$RPM_BUILD_ROOT/%{_mandir} STRIP="" \
-	     SHARED="yes" LIBDIR=$RPM_BUILD_ROOT/%{_libdir}
+	     SHARED="yes" LIBDIR=$RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/pci
 cp -p lib/{pci,header,config,types}.h $RPM_BUILD_ROOT%{_includedir}/pci/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/pci.ids*
-ln -sf libpci.so.3 %{buildroot}%{_libdir}/libpci.so
+install -D -m 0644 lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libpci.pc
+ln -sf /%{_lib}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,16 +89,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc README
 %doc %{_mandir}/man?/*
-%{_libdir}/*.so.*
+/%{_lib}/libpci.so.*
 /sbin/*
 
 %files devel
 %defattr(-, root, root)
 %{_includedir}/pci/
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/libpci.pc
 
 %changelog
 * Fri Apr 11 2008 mrueckert@suse.de
+- move shared libs to /%%{_lib}
+- added pciutils-3.0.0_pkgconfig.patch:
+  clean up the pkgconfig file so we can include it
+- package the pkgconfig file
+* Fri Apr 11 2008 mrueckert@suse.de
 - if we no longer provide the static lib we should at least provide
   the symlink to link against libpci
 * Thu Apr 10 2008 anicka@suse.cz