SPECS: vbetool.spec - use pkg-config for libpci linking; dropped libz patch

qboosh qboosh at pld-linux.org
Sat May 31 02:37:14 CEST 2008


Author: qboosh                       Date: Sat May 31 00:37:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use pkg-config for libpci linking; dropped libz patch

---- Files affected:
SPECS:
   vbetool.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/vbetool.spec
diff -u SPECS/vbetool.spec:1.12 SPECS/vbetool.spec:1.13
--- SPECS/vbetool.spec:1.12	Sat May 31 01:27:52 2008
+++ SPECS/vbetool.spec	Sat May 31 02:37:09 2008
@@ -8,12 +8,13 @@
 Group:		Applications/System
 Source0:	http://www.codon.org.uk/~mjg59/vbetool/download/%{name}-%{version}.tar.gz
 # Source0-md5:	ffb03b118867a02296d7449019ad8846
-Patch0:		%{name}-libz.patch
+#Patch0:		%{name}-libz.patch
 URL:		http://www.codon.org.uk/~mjg59/vbetool/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libx86-devel
-BuildRequires:	pciutils-devel
+BuildRequires:	pciutils-devel >= 3.0.0
+BuildRequires:	pkgconfig
 BuildRequires:	zlib-devel
 # it's supposed to be arch independant; see libx86.spec
 ExclusiveArch: %{ix86} %{x8664}
@@ -35,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__aclocal}
@@ -48,13 +48,16 @@
 
 %{__make} \
 	CC="%{__cc}" \
-	OPT="%{rpmcflags}"
+	OPT="%{rpmcflags}" \
+	vbetool_DEPENDENCIES= \
+	vbetool_LDADD=$(pkg-config --libs libpci)
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	vbetool_DEPENDENCIES=
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008-05-31 00:37:09  qboosh
+- use pkg-config for libpci linking; dropped libz patch
+
 Revision 1.12  2008-05-30 23:27:52  qboosh
 - updated to 1.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vbetool.spec?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list