rpms/libofa/devel libofa-0.9.3-pkgconfig.patch, 1.1, 1.2 libofa.spec, 1.1, 1.2
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Sep 14 13:47:42 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/libofa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26777
Modified Files:
libofa-0.9.3-pkgconfig.patch libofa.spec
Log Message:
* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-8
- better pkgconfig patch, using Libs.private
libofa-0.9.3-pkgconfig.patch:
Index: libofa-0.9.3-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/libofa/devel/libofa-0.9.3-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofa-0.9.3-pkgconfig.patch 12 Sep 2006 17:00:16 -0000 1.1
+++ libofa-0.9.3-pkgconfig.patch 14 Sep 2006 13:47:42 -0000 1.2
@@ -1,11 +1,11 @@
--- libofa-0.9.3/libofa.pc.in.pkgconfig 2006-05-10 12:58:51.000000000 -0500
-+++ libofa-0.9.3/libofa.pc.in 2006-09-12 07:56:00.000000000 -0500
++++ libofa-0.9.3/libofa.pc.in 2006-09-14 08:36:12.000000000 -0500
@@ -7,6 +7,6 @@
Description: The Open Fingerprint Architecture Library
URL: http://www.musicdns.org/
Version: @VERSION@
-Requires: fftw3
-Libs: -L${libdir} -lofa -lexpat -lm
-+#Requires: fftw3
+Libs: -L${libdir} -lofa
++Libs.private: -lfftw -lm
Cflags: -I${includedir}
Index: libofa.spec
===================================================================
RCS file: /cvs/extras/rpms/libofa/devel/libofa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofa.spec 12 Sep 2006 17:00:16 -0000 1.1
+++ libofa.spec 14 Sep 2006 13:47:42 -0000 1.2
@@ -5,7 +5,7 @@
Summary: Open Fingerprint Architecture library
Name: libofa
Version: 0.9.3
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPL
Source0: http://www.musicdns.org/themes/musicdns_org/downloads/libofa-%{version}.tar.gz
@@ -14,13 +14,15 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: libofa-0.9.3-gcc41.patch
-# remove extraneous references in libofa.pc
+# Use Libs.private
Patch2: libofa-0.9.3-pkgconfig.patch
+BuildRequires: findutils
+BuildRequires: pkgconfig sed
BuildRequires: fftw3-devel
+# these are used only in the examples.
BuildRequires: curl-devel
BuildRequires: expat-devel
-BuildRequires: findutils
%description
Currently, MusicDNS and the Open Fingerprint Architecture are being used to:
@@ -35,7 +37,7 @@
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
# removed by patch2
-#Requires: curl-devel expat-devel fftw3-devel
+#Requires: expat-devel fftw3-devel
%description devel
%{summary}.
@@ -48,6 +50,12 @@
%patch1 -p1 -b .gcc41
%patch2 -p1 -b .pkgconfig
+## pkg-config < 0.20.0 (apparently?) doesn't grok URL
+#if "%(pkg-config --version 2>/dev/null)" < "0.20.0"
+%if "%{?fedora}" < "4" || "%{?rhel}" < "5"
+sed -i -e "s|^URL:|#URL:|" *.pc.in ||:
+%endif
+
%build
%configure --disable-static
@@ -91,6 +99,9 @@
%changelog
+* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-8
+- better pkgconfig patch, using Libs.private
+
* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-7
- fix rpmdoc handling
More information about the fedora-extras-commits
mailing list