From ad4d7bb47df9217f2f54a7de53c9ecd770f5d8f0 Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Feb 21 2009 00:52:47 +0000 Subject: Update to 0.14.2 and drop upstreamed patches. --- diff --git a/.cvsignore b/.cvsignore index 435b452..e3fcd82 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libtorrent-rasterbar-0.14.1.tar.gz +libtorrent-rasterbar-0.14.2.tar.gz diff --git a/rb_libtorrent-configure-dont-use-locate.patch b/rb_libtorrent-configure-dont-use-locate.patch deleted file mode 100644 index 0213bed..0000000 --- a/rb_libtorrent-configure-dont-use-locate.patch +++ /dev/null @@ -1,22 +0,0 @@ -When building in a chroot (such as Fedora's Mock tool), using locate to find -where the Python include directory is causes build failures, since the db file -used by (m)locate does not yet exist. - -However, instead of manually calling updatedb, there is no need to even use -locate at all since we already know that the properly-versioned include -directory is under the toplevel $includedir (defined earlier by autotools), and -is simply the same as the versioned Python binary ($ax_python_bin), so we can -simply substitute the locate call with a direct path that functions identically. - -diff -up ./m4/ax_python.m4.old ./m4/ax_python.m4 ---- ./m4/ax_python.m4.old 2009-01-05 15:24:44.000000000 -0800 -+++ ./m4/ax_python.m4 2009-01-05 15:25:31.000000000 -0800 -@@ -64,7 +64,7 @@ ax_python_bin=$PYTHON_BIN - if test x$ax_python_bin != x; then - AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) - AC_CHECK_HEADER([$ax_python_bin/Python.h], -- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], -+ [[ax_python_header=$includedir/$ax_python_bin]], - ax_python_header=no) - if test $ax_python_lib != no; then - if test $ax_python_header != no; then diff --git a/rb_libtorrent-python26.patch b/rb_libtorrent-python26.patch deleted file mode 100644 index 0fd4c69..0000000 --- a/rb_libtorrent-python26.patch +++ /dev/null @@ -1,29 +0,0 @@ -With Python 2.6 (in Fedora rawhide), the current trunk (and 0.14.1) fail to -build the python bindings . I looked into it a bit more deeply and it seems that -AM_PATH_PYTHON is called in configure.in:329 (to check for the python stuff), -and that in turn uses the binary name as the top-level include directory to -search for when attempting to locate the Python headers. However, the m4 file -that defines the macro doesn't find the python2.6 executable because it doesn't -have that python2.6 name in its list (m4/ax_python.m4:61), and so when it finds -the unversioned "python" binary, it uses that as the directory name and thus -fails to properly find the Python headers (which *are* in a versioned directory, -e.g. "$includedir/python2.6/Python.h" - and not "$includedir/python/Python.h" -as it then tries to use). - -The attached patch simply adds python2.6 to to the list, which after recreating -the build files with the already-included autotool.sh script, makes the -configure script properly find the python headers and thus makes the build -successful. - -diff -up ./m4/ax_python.m4.old ./m4/ax_python.m4 ---- ./m4/ax_python.m4.old 2009-01-05 14:50:47.000000000 -0800 -+++ ./m4/ax_python.m4 2009-01-05 14:51:02.000000000 -0800 -@@ -58,7 +58,7 @@ - AC_DEFUN([AX_PYTHON], - [AC_MSG_CHECKING(for python build information) - AC_MSG_RESULT([]) --for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do -+for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do - AC_CHECK_PROGS(PYTHON_BIN, [$python]) - ax_python_bin=$PYTHON_BIN - if test x$ax_python_bin != x; then diff --git a/rb_libtorrent.spec b/rb_libtorrent.spec index 6b5f95a..3defb36 100644 --- a/rb_libtorrent.spec +++ b/rb_libtorrent.spec @@ -2,8 +2,8 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: rb_libtorrent -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.14.2 +Release: 1%{?dist} Summary: A C++ BitTorrent library aiming to be the best alternative Group: System Environment/Libraries @@ -15,17 +15,6 @@ Source1: %{name}-README-renames.Fedora Source2: %{name}-COPYING.Boost Source3: %{name}-COPYING.zlib -## Patch the included m4 Python detection to properly find the binary and -## include directory for Python 2.6 support. -## Upstream bug: http://code.rasterbar.com/libtorrent/ticket/466 -Patch0: %{name}-python26.patch - -## Using locate when we already know where the file is, is a bit silly and -## fails miserably with chroot-based building, since the db file does not -## yet exist. -## Upstream bug: http://code.rasterbar.com/libtorrent/ticket/467 -Patch1: %{name}-configure-dont-use-locate.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: asio-devel @@ -97,10 +86,6 @@ module) that allow it to be used from within Python applications. %prep %setup -q -n "libtorrent-rasterbar-%{version}" -%patch0 -b .python26 -%patch1 -b .dont-use-locate -## We need to recreate the build scripts now that the M4 sources are patched. -./autotool.sh ## The RST files are the sources used to create the final HTML files; and are ## not needed. rm -f docs/*.rst @@ -197,6 +182,12 @@ rm -rf %{buildroot} %changelog +* Fri Feb 20 2009 Peter Gordon - 0.14.2-1 +- Update to new upstream bug-fix release (0.14.2) +- Drop Python 2.6 and configure fix patches (fixed upstream): + - python26.patch + - configure-dont-use-locate.patch + * Fri Jan 16 2009 Peter Gordon - 0.14.1-2 - Rebuild for the soname bump in openssl-0.9.8j diff --git a/sources b/sources index 8efcc11..dd46f76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6aa0ed4da604b8b160bf12bcd41d5055 libtorrent-rasterbar-0.14.1.tar.gz +97bb2db5ac21e9a81c96fc0e2abe6d29 libtorrent-rasterbar-0.14.2.tar.gz