[rb_libtorrent] - rb_libtorrent-0.14.11 - track lib soname

Rex Dieter rdieter at fedoraproject.org
Wed Aug 25 14:00:16 UTC 2010 

commit ba0ee35174519510585a39d54aa1eb2c04861cb1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 25 09:05:20 2010 -0500

    - rb_libtorrent-0.14.11
    - track lib soname

 .gitignore                          |    3 +-
 rb_libtorrent-0.14.10-py27-am.patch |   11 ++++
 rb_libtorrent-0.14.10-py27.patch    |   11 ----
 rb_libtorrent.spec                  |   95 +++++++++++++++++++----------------
 sources                             |    2 +-
 5 files changed, 65 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 645c6c9..3518ce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-libtorrent-rasterbar-0.14.8.tar.gz
-libtorrent-rasterbar-0.14.10.tar.gz
+/libtorrent-rasterbar-0.14.11.tar.gz
diff --git a/rb_libtorrent-0.14.10-py27-am.patch b/rb_libtorrent-0.14.10-py27-am.patch
new file mode 100644
index 0000000..f149587
--- /dev/null
+++ b/rb_libtorrent-0.14.10-py27-am.patch
@@ -0,0 +1,11 @@
+--- libtorrent-rasterbar-0.14.10/m4/ax_python-fixed.m4.py27	2009-09-05 23:18:55.000000000 +0900
++++ libtorrent-rasterbar-0.14.10/m4/ax_python-fixed.m4	2010-07-29 03:23:26.000000000 +0900
+@@ -58,7 +58,7 @@
+ AC_DEFUN([AX_PYTHON],
+ [AC_MSG_CHECKING(for python build information)
+ AC_MSG_RESULT([])
+-for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
++for python in python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+ # AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ PYTHON_BIN=$python
+ ax_python_bin=$PYTHON_BIN
diff --git a/rb_libtorrent-0.14.10-py27.patch b/rb_libtorrent-0.14.10-py27.patch
index 8083949..305866c 100644
--- a/rb_libtorrent-0.14.10-py27.patch
+++ b/rb_libtorrent-0.14.10-py27.patch
@@ -9,14 +9,3 @@
  # AC_CHECK_PROGS(PYTHON_BIN, [$python])
  PYTHON_BIN=$python
  ax_python_bin=$PYTHON_BIN
---- libtorrent-rasterbar-0.14.10/m4/ax_python-fixed.m4.py27	2009-09-05 23:18:55.000000000 +0900
-+++ libtorrent-rasterbar-0.14.10/m4/ax_python-fixed.m4	2010-07-29 03:23:26.000000000 +0900
-@@ -58,7 +58,7 @@
- AC_DEFUN([AX_PYTHON],
- [AC_MSG_CHECKING(for python build information)
- AC_MSG_RESULT([])
--for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-+for python in python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
- # AC_CHECK_PROGS(PYTHON_BIN, [$python])
- PYTHON_BIN=$python
- ax_python_bin=$PYTHON_BIN
diff --git a/rb_libtorrent.spec b/rb_libtorrent.spec
index 64ea1a6..ae857ee 100644
--- a/rb_libtorrent.spec
+++ b/rb_libtorrent.spec
@@ -1,6 +1,6 @@
 Name:		rb_libtorrent
-Version:	0.14.10
-Release:	4%{?dist}
+Version:	0.14.11
+Release:	1%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -11,12 +11,14 @@ Source0:	http://libtorrent.googlecode.com/files/libtorrent-rasterbar-%{version}.
 Source1:	%{name}-README-renames.Fedora
 Source2:	%{name}-COPYING.Boost
 Source3:	%{name}-COPYING.zlib
+# fix DSO problems
 Patch0:		rb_libtorrent-am.patch
 Patch1:		rb_libtorrent-in.patch
-# Not needed for 0.15.1
-Patch2:		rb_libtorrent-0.14.10-py27.patch
+# fix build against python27, Not needed for 0.15.1
+Patch2:		rb_libtorrent-0.14.10-py27-am.patch
+Patch3:		rb_libtorrent-0.14.10-py27.patch
 # Seems still needed for 0.15.1
-Patch3:		rb_libtorrent-0.14.10-gcc45.patch
+Patch4:		rb_libtorrent-0.14.10-gcc45.patch
 
 BuildRequires:	asio-devel
 BuildRequires:	boost-devel
@@ -44,7 +46,7 @@ Group:		Development/Libraries
 License:	BSD and zlib and Boost
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-## Same include directory. :(
+## FIXME: Same include directory. :(
 Conflicts:	libtorrent-devel
 ## Needed for various headers used via #include directives...
 Requires:	asio-devel
@@ -88,11 +90,12 @@ module) that allow it to be used from within Python applications.
 
 %prep
 %setup -q -n "libtorrent-rasterbar-%{version}"
-%patch0 -p1
+## patch0 and patch2 touch automake-related files
+#patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .py27
-touch configure
-%patch3 -p1 -b .gcc45
+#patch2 -p1 -b .py27-am
+%patch3 -p1 -b .py27
+%patch4 -p1 -b .gcc45
 
 ## The RST files are the sources used to create the final HTML files; and are
 ## not needed.
@@ -105,12 +108,22 @@ install -p -m 0644 %{SOURCE3} COPYING.zlib
 iconv -t UTF-8 -f ISO_8859-15 AUTHORS -o AUTHORS.iconv
 mv AUTHORS.iconv AUTHORS
 
+## Fix the interpreter for the example clients
+sed -i -e 's:^#!/bin/python$:#!/usr/bin/python:' bindings/python/{simple_,}client.py
+
+# safer and less side-effects than using LIBTOOL=/usr/bin/libtool -- Rex
+# else, can use the autoreconf -i hammer
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
 
-%build
 ## XXX: Even with the --with-asio=system configure option, the stuff in
 ## the local include directory overrides that of the system. We don't like
 ## local copies of system code. :)
+rm -rf include/libtorrent/asio*
+
 
+%build
 ## FIXME
 ## FIXME
 ## There are lots of warning about breaking aliasing rules, so
@@ -119,8 +132,8 @@ mv AUTHORS.iconv AUTHORS
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
-rm -rf include/libtorrent/asio*
-%configure --disable-static				\
+%configure \
+	--disable-static				\
 	--enable-examples				\
 	--enable-python-binding				\
 	--with-asio=system				\
@@ -132,13 +145,8 @@ rm -rf include/libtorrent/asio*
 	--with-boost-thread=mt				\
 	--with-libgeoip=system				\
 	--with-zlib=system
-## Use the system libtool to ensure that we don't get unnecessary RPATH
-## hacks in our final build.
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
-pushd bindings/python
-	## Fix the interpreter for the example clients
-	sed -i -e 's:^#!/bin/python$:#!/usr/bin/python:' {simple_,}client.py 
-popd
+
+make %{?_smp_mflags}
 
 
 %check
@@ -158,6 +166,12 @@ pushd bindings/python
 	%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 popd 
 
+## unpackged files
+# .la files
+rm -fv %{buildroot}%{_libdir}/lib*.la
+# static libs
+rm -fv %{buildroot}%{_libdir}/lib*.a
+
 
 %clean
 rm -rf %{buildroot}
@@ -165,19 +179,13 @@ rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%exclude %{_libdir}/*.la
-%{_libdir}/libtorrent-rasterbar.so.*
-## Unfortunately (even with the "--disable-static" option to the %%configure
-## invocation) our use of the system libtool creates static libraries at build
-## time, so we must exclude them here.
-%exclude %{_libdir}/*.a
+%{_libdir}/libtorrent-rasterbar.so.5*
 
 %files	devel
 %defattr(-,root,root,-)
@@ -200,28 +208,29 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.14.11-1
+- rb_libtorrent-0.14.11
+- track lib soname
+
 * Thu Jul 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.14.10-4
+- Patch for python2.7 and g++4.5
+- Pass -fno-strict-aliasing for now
 - Copy from F-13 branch (F-14 branch still used 0.14.8)
-  Changelogs from F-13:
-    * Fri May 28 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.14.10-3
-    - Patch from Bruno Wolff III to fix DSO linking rhbz565082
-    - Update spec to match current guidelines
 
-    * Fri May 28 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.14.10-2
-    - Fix E-V-R issue that breaks qbittorrent and deluge for upgrades
-    - Add default attributes to examples 
+* Fri May 28 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.14.10-3
+- Patch from Bruno Wolff III to fix DSO linking rhbz565082
+- Update spec to match current guidelines
 
-    * Sun Apr 04 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.14.10-1
-    - Update to new upstream release (0.14.10)
+* Fri May 28 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.14.10-2
+- Fix E-V-R issue that breaks qbittorrent and deluge for upgrades
+- Add default attributes to examples 
 
-    * Fri Mar 12 2010 leigh scott <leigh123linux at googlemail.com> - 0.14.9-1
-    - Update to new upstream release (0.14.9)
-    - Fix source URL
-- Patch for python2.7 and g++4.5
-- Pass -fno-strict-aliasing for now
+* Sun Apr 04 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.14.10-1
+- Update to new upstream release (0.14.10)
 
-* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.14.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+* Fri Mar 12 2010 leigh scott <leigh123linux at googlemail.com> - 0.14.9-1
+- Update to new upstream release (0.14.9)
+- Fix source URL
 
 * Tue Jan 19 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.14.8-2
 - Rebuild per
diff --git a/sources b/sources
index de11e24..30d862b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99e9f4fa9c9f1f5097a4748c7260ef53  libtorrent-rasterbar-0.14.10.tar.gz
+bac05b1e13a8547aa7d57ce9e991bd43  libtorrent-rasterbar-0.14.11.tar.gz

More information about the scm-commits mailing list