rpms/rb_libtorrent/F-13 rb_libtorrent-am.patch, NONE, 1.1 rb_libtorrent-in.patch, NONE, 1.1 rb_libtorrent.spec, 1.31, 1.32
Rahul Sundaram
sundaram at fedoraproject.org
Fri May 28 03:38:37 UTC 2010
Author: sundaram
Update of /cvs/pkgs/rpms/rb_libtorrent/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22512
Modified Files:
rb_libtorrent.spec
Added Files:
rb_libtorrent-am.patch rb_libtorrent-in.patch
Log Message:
* 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
rb_libtorrent-am.patch:
Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE rb_libtorrent-am.patch ---
--- libtorrent-rasterbar-0.14.10/examples/Makefile.am.orig 2010-05-28 08:37:02.290439097 +0530
+++ libtorrent-rasterbar-0.14.10/examples/Makefile.am 2010-05-28 08:37:21.397439025 +0530
@@ -6,8 +6,7 @@
EXTRA_DIST = Jamfile
client_test_SOURCES = client_test.cpp
-client_test_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la @BOOST_REGEX_LIB@ @BOOST_PROGRAM_OPTIONS_LIB@
-
+client_test_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la @BOOST_REGEX_LIB@ @BOOST_PROGRAM_OPTIONS_LIB@ -lrt
dump_torrent_SOURCES = dump_torrent.cpp
dump_torrent_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
rb_libtorrent-in.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE rb_libtorrent-in.patch ---
--- libtorrent-rasterbar-0.14.10/examples/Makefile.in.orig 2010-05-28 08:38:35.060439029 +0530
+++ libtorrent-rasterbar-0.14.10/examples/Makefile.in 2010-05-28 08:40:31.017689483 +0530
@@ -263,7 +263,7 @@
top_srcdir = @top_srcdir@
EXTRA_DIST = Jamfile
client_test_SOURCES = client_test.cpp
-client_test_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la @BOOST_REGEX_LIB@ @BOOST_PROGRAM_OPTIONS_LIB@
+client_test_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la @BOOST_REGEX_LIB@ @BOOST_PROGRAM_OPTIONS_LIB@ -lrt
dump_torrent_SOURCES = dump_torrent.cpp
dump_torrent_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
make_torrent_SOURCES = make_torrent.cpp
Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-13/rb_libtorrent.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- rb_libtorrent.spec 28 May 2010 01:15:14 -0000 1.31
+++ rb_libtorrent.spec 28 May 2010 03:38:37 -0000 1.32
@@ -1,9 +1,6 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?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.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A C++ BitTorrent library aiming to be the best alternative
Group: System Environment/Libraries
@@ -14,8 +11,8 @@ Source0: http://libtorrent.googlecode.co
Source1: %{name}-README-renames.Fedora
Source2: %{name}-COPYING.Boost
Source3: %{name}-COPYING.zlib
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: rb_libtorrent-am.patch
+Patch1: rb_libtorrent-in.patch
BuildRequires: asio-devel
BuildRequires: boost-devel
@@ -87,6 +84,9 @@ module) that allow it to be used from wi
%prep
%setup -q -n "libtorrent-rasterbar-%{version}"
+%patch0 -p1
+%patch1 -p1
+
## The RST files are the sources used to create the final HTML files; and are
## not needed.
rm -f docs/*.rst
@@ -184,6 +184,10 @@ rm -rf %{buildroot}
%changelog
+* 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
More information about the scm-commits
mailing list