packages: libtorrent-rasterbar/libtorrent-rasterbar.spec, libtorrent-raster...

wiget wiget at pld-linux.org
Sat Nov 14 14:20:56 CET 2009 

Author: wiget                        Date: Sat Nov 14 13:20:56 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix bashizm in configure
- build python bindings
- use system GeoIP
- release 2

---- Files affected:
packages/libtorrent-rasterbar:
   libtorrent-rasterbar.spec (1.22 -> 1.23) , bashizm.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libtorrent-rasterbar/libtorrent-rasterbar.spec
diff -u packages/libtorrent-rasterbar/libtorrent-rasterbar.spec:1.22 packages/libtorrent-rasterbar/libtorrent-rasterbar.spec:1.23
--- packages/libtorrent-rasterbar/libtorrent-rasterbar.spec:1.22	Mon Sep 21 16:29:55 2009
+++ packages/libtorrent-rasterbar/libtorrent-rasterbar.spec	Sat Nov 14 14:20:50 2009
@@ -4,18 +4,23 @@
 Summary(pl.UTF-8):	Biblioteka BitTorrenta napisana w C++
 Name:		libtorrent-rasterbar
 Version:	0.14.6
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/libtorrent/%{name}-%{version}.tar.gz
 # Source0-md5:	1b5b91a5d0abb8cefef9f4195738e621
 URL:		http://www.rasterbar.com/products/libtorrent/
+Patch0:		bashizm.patch
+BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	boost-devel >= 1.35.0
+BuildRequires:	boost-python-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig >= 1:0.20
+BuildRequires:	python-devel
 BuildRequires:	sed >= 4.0
 BuildRequires:	util-linux-ng
 BuildRequires:	which
@@ -98,8 +103,17 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka libtorrent-rasterbar.
 
+%package -n python-libtorrent-rasterbar
+Summary:	Python bindings for libtorrent-rasterbar
+Group:		Libraries/Python
+Requires:	%{name} = %{version}-%{release}
+
+%description -n python-libtorrent-rasterbar
+Python bindings for libtorrent-rasterbar.
+
 %prep
 %setup -q
+%patch0 -p1
 %{__sed} -i 's/ACLOCAL_AMFLAGS = -I m4/#ACLOCAL_AMFLAGS = -I m4/' Makefile.am
 
 ## Some of the sources and docs are executable, which makes rpmlint against
@@ -116,12 +130,15 @@
 %{__autoconf}
 %{__automake}
 %configure \
+	--enable-python-binding \
 	--with-boost-system=boost_system \
 	--with-boost-filesystem=boost_filesystem \
 	--with-boost-thread=boost_thread \
 	--with-boost-regex=boost_regex \
 	--with-boost-program-options=boost_program_options \
-	--with-{asio,zlib}=system \
+	--with-asio=system \
+	--with-zlib=system \
+	--with-libgeoip=system \
 	--with-ssl
 
 %{__make} LDFLAGS="-L%{_libdir}64 %{rpmldflags}"
@@ -160,12 +177,22 @@
 %defattr(644,root,root,755)
 %{_libdir}/libtorrent-rasterbar.a
 
+%files -n python-libtorrent-rasterbar
+%{py_sitedir}/libtorrent.so
+%{py_sitedir}/python_libtorrent-*.egg-info
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2009/11/14 13:20:50  wiget
+- fix bashizm in configure
+- build python bindings
+- use system GeoIP
+- release 2
+
 Revision 1.22  2009/09/21 14:29:55  lisu
 - notice patch remove in previous log
 

================================================================
Index: packages/libtorrent-rasterbar/bashizm.patch
diff -u /dev/null packages/libtorrent-rasterbar/bashizm.patch:1.1
--- /dev/null	Sat Nov 14 14:20:56 2009
+++ packages/libtorrent-rasterbar/bashizm.patch	Sat Nov 14 14:20:50 2009
@@ -0,0 +1,94 @@
+--- 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(
+ # 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,)
+-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 "
+ 
+                ;;
+        "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_EXCEPTION_DISABLE,,[We do not need boost.exception features])
+-COMPILETIME_OPTIONS+="-DBOOST_EXCEPTION_DISABLE "
++COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DBOOST_EXCEPTION_DISABLE "
+ 
+ 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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtorrent-rasterbar/libtorrent-rasterbar.spec?r1=1.22&r2=1.23&f=u

More information about the pld-cvs-commit mailing list