Author: qboosh Date: Sun May 8 11:43:42 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated bashizm patch is back - removed obsolete py27 patch - general cleanup - pl for python- - release 3
---- Files affected: packages/libtorrent-rasterbar: bashizm.patch (1.3 -> 1.4) , libtorrent-rasterbar.spec (1.55 -> 1.56) , py27.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/libtorrent-rasterbar/bashizm.patch diff -u packages/libtorrent-rasterbar/bashizm.patch:1.3 packages/libtorrent-rasterbar/bashizm.patch:1.4 --- packages/libtorrent-rasterbar/bashizm.patch:1.3 Mon Apr 12 19:23:11 2010 +++ packages/libtorrent-rasterbar/bashizm.patch Sun May 8 13:43:36 2011 @@ -1,94 +1,128 @@ ---- libtorrent-rasterbar-0.14.6/configure.in.wiget 2009-11-14 13:39:06.000000000 +0100 -+++ libtorrent-rasterbar-0.14.6/configure.in 2009-11-14 13:44:58.000000000 +0100 -@@ -185,7 +185,7 @@ AC_ARG_WITH( +--- libtorrent-rasterbar-0.15.6/configure.ac.orig 2011-04-10 05:51:58.000000000 +0200 ++++ libtorrent-rasterbar-0.15.6/configure.ac 2011-05-08 13:09:24.207803549 +0200 +@@ -336,7 +336,7 @@ + ["no"|"off"], [ + AC_MSG_RESULT([no]) + AC_DEFINE([TORRENT_NO_DEPRECATE],[1],[Define to exclude all deprecated functions from the API.]) +- COMPILETIME_OPTIONS+="-DTORRENT_NO_DEPRECATE " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_NO_DEPRECATE " + ], + [AC_MSG_RESULT([$ARG_ENABLE_DEPRECATED]) + AC_MSG_ERROR([Unknown option "$ARG_ENABLE_DEPRECATED". Use either "yes" or "no".])] +@@ -347,13 +347,13 @@ + ["yes"], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([TORRENT_DEBUG],[1],[Define to enable debug code.]) +- COMPILETIME_OPTIONS+="-DTORRENT_DEBUG " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_DEBUG " + DEBUGFLAGS="-g" + ], + ["no"], [ + AC_MSG_RESULT([no]) + AC_DEFINE([NDEBUG],[1],[Define to disable debug code.]) +- #COMPILETIME_OPTIONS+="-DNDEBUG " ++ #COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DNDEBUG " + DEBUGFLAGS="-Os" + ], + [AC_MSG_RESULT([$ARG_ENABLE_DEBUG]) +@@ -387,7 +387,7 @@ + ["yes"|"default"], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([TORRENT_LOGGING],[1],[Define to enable logging of the session events.]) +- COMPILETIME_OPTIONS+="-DTORRENT_LOGGING " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_LOGGING " + ], + ["no"|"none"], [ + AC_MSG_RESULT([no]) +@@ -395,12 +395,12 @@ + ["verbose"], [ + AC_MSG_RESULT([verbose]) + AC_DEFINE([TORRENT_VERBOSE_LOGGING],[1],[Define to enable logging of the session events and every peer connection.]) +- COMPILETIME_OPTIONS+="-DTORRENT_VERBOSE_LOGGING " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_VERBOSE_LOGGING " + ], + ["errors"], [ + AC_MSG_RESULT([errors]) + AC_DEFINE([TORRENT_ERROR_LOGGING],[1],[Define to enable logging of the session events and every peer connection limited to errors.]) +- COMPILETIME_OPTIONS+="-DTORRENT_ERROR_LOGGING " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_ERROR_LOGGING " + ], + [AC_MSG_RESULT([$ARG_ENABLE_LOGGING]) + AC_MSG_ERROR([Unknown option "$ARG_ENABLE_LOGGING". Use either "yes", "no", "verbose" or "errors".])] +@@ -443,7 +443,7 @@ + + AX_CHECK_OPENSSL([ + AC_DEFINE([TORRENT_USE_OPENSSL],[1],[Define to use OpenSSL support.]) +- COMPILETIME_OPTIONS+="-DTORRENT_USE_OPENSSL " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_USE_OPENSSL " + ], [ + AC_MSG_ERROR([OpenSSL library not found. Try using --with-openssl=DIR or disabling encryption at all.]) + ]) +@@ -451,7 +451,7 @@ + ["no"|"off"], [ + AC_MSG_RESULT([no]) + AC_DEFINE([TORRENT_DISABLE_ENCRYPTION],[1],[Define to disable any encryption support and avoid linking against OpenSSL.]) +- COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_ENCRYPTION " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_DISABLE_ENCRYPTION " + ], + [AC_MSG_RESULT([$ARG_ENABLE_ENCRYPTION]) + AC_MSG_ERROR([Unknown option "$ARG_ENABLE_ENCRYPTION". Use either "yes" or "no".])] +@@ -465,7 +465,7 @@ + ["no"], [ + AC_MSG_RESULT([no]) + AC_DEFINE([TORRENT_DISABLE_GEO_IP],[1],[Define to disable the GeoIP support and avoid linking against LGPLed code.]) +- COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_GEO_IP " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_DISABLE_GEO_IP " + ], + [AC_MSG_RESULT([$ARG_ENABLE_GEOIP]) + AC_MSG_ERROR([Unknown option "$ARG_ENABLE_GEOIP". Use either "yes" or "no".])] +@@ -479,12 +479,12 @@ + ["no"|"off"], [ + AC_MSG_RESULT([no]) + AC_DEFINE([TORRENT_DISABLE_DHT],[1],[Define to disable the DHT support.]) +- COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_DHT " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_DISABLE_DHT " + ], + ["logging"], [ + AC_MSG_RESULT([logging]) + AC_DEFINE([TORRENT_DHT_VERBOSE_LOGGING],[1],[Define to enable DHT support with verbose logging.]) +- COMPILETIME_OPTIONS+="-DTORRENT_DHT_VERBOSE_LOGGING " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_DHT_VERBOSE_LOGGING " + ], + [AC_MSG_RESULT([$ARG_ENABLE_DHT]) + AC_MSG_ERROR([Unknown option "$ARG_ENABLE_DHT". Use either "yes", "no" or "logging".])] +@@ -596,7 +596,7 @@ + AC_MSG_RESULT([no]) + ARG_WITH_LIBGEOIP="no" + AC_DEFINE([WITH_SHIPPED_GEOIP_H],[1],[Define to use shipped copy of GeoIP.h]) +- COMPILETIME_OPTIONS+="-DWITH_SHIPPED_GEOIP_H " ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DWITH_SHIPPED_GEOIP_H " + ]) + ], + [AC_MSG_RESULT([$ARG_WITH_LIBGEOIP]) +@@ -624,13 +624,13 @@ # this works around a bug in asio in boost-1.39 # see: https://svn.boost.org/trac/boost/ticket/3095 - AC_DEFINE(BOOST_ASIO_HASH_MAP_BUCKETS,1021,) + AC_DEFINE([BOOST_ASIO_HASH_MAP_BUCKETS],[1021],[Define to fix a wrong behavior in boost 1.39.]) -COMPILETIME_OPTIONS+="-DBOOST_ASIO_HASH_MAP_BUCKETS=1021 " -+COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 " ++COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 " - dnl Check the value for the --with-logging switch - AC_MSG_CHECKING([what form of logging to use]) -@@ -196,12 +196,12 @@ case "$logging" in - "default") - AC_MSG_RESULT(default) - AC_DEFINE(TORRENT_LOGGING,,[define to use some logging]) -- COMPILETIME_OPTIONS+="-DTORRENT_LOGGING " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_LOGGING " - ;; - "verbose") - AC_MSG_RESULT(verbose) - AC_DEFINE(TORRENT_VERBOSE_LOGGING,,[define to use verbose logging]) -- COMPILETIME_OPTIONS+="-DTORRENT_VERBOSE_LOGGING " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_VERBOSE_LOGGING " - ;; - *) - AC_MSG_RESULT() -@@ -225,12 +225,12 @@ case "$dht" in - "off") - AC_MSG_RESULT(off) - AC_DEFINE(TORRENT_DISABLE_DHT,,[define not to use DHT support]) -- COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_DHT " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DISABLE_DHT " - ;; - "logging") - AC_MSG_RESULT(logging) - AC_DEFINE(TORRENT_DHT_VERBOSE_LOGGING,,[define to use DHT support with extra logging]) -- COMPILETIME_OPTIONS+="-DTORRENT_DHT_VERBOSE_LOGGING " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DHT_VERBOSE_LOGGING " - ;; - *) - AC_MSG_RESULT() -@@ -254,13 +254,13 @@ case "$encryption" in - AC_MSG_RESULT(on) - CHECK_SSL() - AC_DEFINE(TORRENT_USE_OPENSSL,,[define to use openssl with libtorrent-rasterbar]) -- COMPILETIME_OPTIONS+="-DTORRENT_USE_OPENSSL " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_USE_OPENSSL " + AC_DEFINE([BOOST_EXCEPTION_DISABLE],[1],[Define to disable the boost.exception features.]) +-COMPILETIME_OPTIONS+="-DBOOST_EXCEPTION_DISABLE " ++COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_EXCEPTION_DISABLE " - ;; - "off") - AC_MSG_RESULT(off) - AC_DEFINE(TORRENT_DISABLE_ENCRYPTION,,[define not to use encryption support]) -- COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_ENCRYPTION " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DISABLE_ENCRYPTION " - ;; - *) - AC_MSG_RESULT() -@@ -476,11 +476,11 @@ esac - dnl Set some defines if we are building a shared library - if [[ "x$enable_shared" == "xyes" ]]; then - AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.]) -- COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_LINKING_SHARED " - fi + AC_DEFINE([BOOST_FILESYSTEM_VERSION],[2],[Define to select the boost.filesystem library version 2.]) +-COMPILETIME_OPTIONS+="-DBOOST_FILESYSTEM_VERSION=2 " ++COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_FILESYSTEM_VERSION=2 " - AC_DEFINE(BOOST_EXCEPTION_DISABLE,,[We do not need boost.exception features]) --COMPILETIME_OPTIONS+="-DBOOST_EXCEPTION_DISABLE " -+COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DBOOST_EXCEPTION_DISABLE " + dnl Use possibly specific python install params + AC_ARG_VAR([PYTHON_INSTALL_PARAMS], [Set specific install parameters for python bindings.]) +@@ -640,7 +640,7 @@ + dnl Set some defines if we are building a shared library + AS_IF([test "x$enable_shared" = "xyes"], + [AC_DEFINE([TORRENT_BUILDING_SHARED],[1],[Define to exports functions and classes with default visibility in GCC.]) +- COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "]) ++ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DTORRENT_LINKING_SHARED "]) - dnl want some debugging symbols with that? - AC_ARG_ENABLE( -@@ -490,11 +490,11 @@ AC_ARG_ENABLE( - no) - AC_DEFINE(NDEBUG,,[Define to disable debugging]) - DEBUGFLAGS="-Os" --# COMPILETIME_OPTIONS+="-DNDEBUG " -+# COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DNDEBUG " - ;; - yes) - DEBUGFLAGS="-g" -- COMPILETIME_OPTIONS+="-DTORRENT_DEBUG " -+ COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DEBUG " - AC_DEFINE(TORRENT_DEBUG,,[Define to enable libtorrent debug build]) - ;; - *) -@@ -504,7 +504,7 @@ AC_ARG_ENABLE( - esac], - [DEBUGFLAGS="-Os" - AC_DEFINE(NDEBUG,,[Define to disable debugging]) --# COMPILETIME_OPTIONS+="-DNDEBUG " -+# COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DNDEBUG " - ] - ) AC_SUBST(DEBUGFLAGS) + AC_SUBST(PYTHON_INSTALL_PARAMS) ================================================================ Index: packages/libtorrent-rasterbar/libtorrent-rasterbar.spec diff -u packages/libtorrent-rasterbar/libtorrent-rasterbar.spec:1.55 packages/libtorrent-rasterbar/libtorrent-rasterbar.spec:1.56 --- packages/libtorrent-rasterbar/libtorrent-rasterbar.spec:1.55 Wed May 4 15:51:14 2011 +++ packages/libtorrent-rasterbar/libtorrent-rasterbar.spec Sun May 8 13:43:36 2011 @@ -4,7 +4,7 @@ Summary(pl.UTF-8): Biblioteka BitTorrenta napisana w C++ Name: libtorrent-rasterbar Version: 0.15.6 -Release: 2 +Release: 3 Epoch: 1 License: BSD Group: Libraries @@ -12,14 +12,13 @@ # Source0-md5: 53c64fe121c7fd0383f90dc653930f4a URL: http://www.rasterbar.com/products/libtorrent/ Patch0: bashizm.patch -Patch1: py27.patch BuildRequires: GeoIP-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.11 BuildRequires: boost-devel >= 1.35.0 BuildRequires: boost-python-devel BuildRequires: libstdc++-devel -BuildRequires: libtool +BuildRequires: libtool >= 2:2.2.6 BuildRequires: openssl-devel BuildRequires: pkgconfig >= 1:0.20 BuildRequires: python-devel @@ -109,17 +108,19 @@ %package -n python-libtorrent-rasterbar Summary: Python bindings for libtorrent-rasterbar +Summary(pl.UTF-8): Wiązania Pythona do biblioteki libtorrent-rasterbar Group: Libraries/Python Requires: %{name} = %{epoch}:%{version}-%{release} %description -n python-libtorrent-rasterbar Python bindings for libtorrent-rasterbar. +%description -n python-libtorrent-rasterbar -l pl.UTF-8 +Wiązania Pythona do biblioteki libtorrent-rasterbar. + %prep %setup -q -# %patch0 -p1 -# %patch1 -p1 -%{__sed} -i 's/ACLOCAL_AMFLAGS = -I m4/#ACLOCAL_AMFLAGS = -I m4/' Makefile.am +%patch0 -p1 ## Some of the sources and docs are executable, which makes rpmlint against ## the resulting -debuginfo and -devel packages, respectively, quite angry. :] @@ -136,6 +137,7 @@ %{__automake} %configure \ LIBS="-lpthread -lrt" \ + --disable-silent-rules \ --enable-python-binding \ --with-boost-libdir=%{_libdir} \ --with-boost-system=boost_system \ @@ -152,15 +154,10 @@ %install rm -rf $RPM_BUILD_ROOT -## Ensure that we preserve our timestamps properly. -#export CPPROG="%{__cp} -p" -#make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p" + %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -## Do the renaming due to the somewhat limited %{_bindir} namespace. -rename client torrent_client $RPM_BUILD_ROOT%{_bindir}/* - %clean rm -rf $RPM_BUILD_ROOT @@ -170,7 +167,8 @@ %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog COPYING README -%attr(755,root,root) %{_libdir}/libtorrent-rasterbar.so* +%attr(755,root,root) %{_libdir}/libtorrent-rasterbar.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libtorrent-rasterbar.so.6 %files devel %defattr(644,root,root,755) @@ -186,7 +184,7 @@ %files -n python-libtorrent-rasterbar %defattr(644,root,root,755) -%{py_sitedir}/libtorrent.so +%attr(755,root,root) %{py_sitedir}/libtorrent.so %{py_sitedir}/python_libtorrent-*.egg-info %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -195,6 +193,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.56 2011/05/08 11:43:36 qboosh +- updated bashizm patch is back +- removed obsolete py27 patch +- general cleanup +- pl for python- +- release 3 + Revision 1.55 2011/05/04 13:51:14 arekm - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtorrent-rasterbar/bashizm.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtorrent-rasterbar/libtorrent-rasterbar.spec?r1=1.55&r2=1.56&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
