rpms/rb_libtorrent/devel rb_libtorrent.spec,1.2,1.3

Peter Gordon (pgordon) fedora-extras-commits at redhat.com
Sun Jan 28 19:14:34 UTC 2007


Author: pgordon

Update of /cvs/extras/rpms/rb_libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26139/devel

Modified Files:
	rb_libtorrent.spec 
Log Message:
Fix installed pkgconfig file.


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rb_libtorrent.spec	28 Jan 2007 17:25:23 -0000	1.2
+++ rb_libtorrent.spec	28 Jan 2007 19:14:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		rb_libtorrent
 Version:	0.11
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -65,11 +65,12 @@
 install -p -m 0644 COPYING COPYING.BSD
 install -p -m 0644 %{SOURCE2} COPYING.Boost
 install -p -m 0644 %{SOURCE3} COPYING.zlib
+## Fix the installed pkgconfig file: we don't need linkage that the
+## libtorrent DSO already takes care of. 
+sed -i -e 's/^Libs:.*$/Libs: -L${libdir} -ltorrent/' libtorrent.pc.in 
 
 
 %build
-## We don't need multiple zlib link options in the installed pkgconfig file.
-%{__sed} -i -e 's/@ZLIB@//' libtorrent.pc.in
 %configure --disable-static --enable-examples --with-zlib=system
 make %{?_smp_mflags}
 
@@ -114,6 +115,12 @@
 
 
 %changelog
+* Sun Jan 28 2007 Peter Gordon <peter at thecodergeek.com> - 0.11-5
+- Fix installed pkgconfig file: Strip everything from Libs except for
+  '-ltorrent', as its [libtorrent's] DSO will ensure proper linking to other
+  needed libraries such as zlib and boost_thread. (Thanks to Michael Schwendt
+  and Mamoru Tasaka; bug #221372)
+
 * Sat Jan 27 2007 Peter Gordon <peter at thecodergeek.com> - 0.11-4
 - Clarify potential licensing issues in the -devel subpackage:
   + COPYING.zlib




More information about the fedora-extras-commits mailing list