Hello all,
Sorry for providing it here as a patch, I am not at my computer right now.
It would be nice if someone will review and commit these changes for
`rtorrent-0.8.9.`
Some differences from an original spec:
-----------------------
1) curl version unification (7.19.7 in all cases);
2) 'BuildRequires' fixed for libtorrent-devel version;
3) some really unneeded functionality dropped (ldaps, nss support);
4) curl 'pkgconfig path' fixed, now it works properly both with static build
and mock;
5) xmlrpc support added;
6) now can be compiled under rhel5;
7) fix for included man-page.
I see there are no 'xmlrpc-c' packages in the repo, I can provide working
spec for `xmlrpc-c-1.22`, if someone interested.
Also, there is a patch for `ip_filter` functionality for rtorrent:
http://www.fateyev.com/files/coding/rtorrent-0.8.9-ip_filter_no_boost-fast-bsd2.patch(again,
if somebody needs it.)
---
wbr, Denis.
--- rtorrent.spec 2011-08-12 22:36:21.353452001 +0600
+++ rtorrent.new.spec 2011-08-18 22:20:00.000000000 +0600
@@ -2,12 +2,13 @@
# Authority: yury
# Upstream: Jari "Rakshasa" Sundell <sundell,software$gmail,com>
-%{?el5:%define curl_version 7.19.6}
+### More unification with curl version (7.19.7 shipped with el6)
+%{?el5:%define curl_version 7.19.7}
Summary: Console-based BitTorrent client
Name: rtorrent
Version: 0.8.9
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Applications/Internet
URL: http://libtorrent.rakshasa.no/
@@ -18,13 +19,11 @@
BuildRequires: gcc-c++
BuildRequires: libsigc++20-devel
-BuildRequires: libtorrent-devel >= 0.12.5
+BuildRequires: libtorrent-devel >= 0.12.9
BuildRequires: ncurses-devel
-### Curl BuildRequires from Rawhide (no stunnel!)
BuildRequires: krb5-devel
BuildRequires: libidn-devel
-BuildRequires: nss-devel
BuildRequires: openldap-devel
BuildRequires: openssh-clients
BuildRequires: openssh-server
@@ -32,6 +31,12 @@
BuildRequires: valgrind
BuildRequires: zlib-devel
+%{?el6:BuildRequires: curl-devel}
+%{?el6:BuildRequires: cppunit}
+%{?el6:BuildRequires: cppunit-devel}
+BuildRequires: xmlrpc-c-devel
+
+
%description
rTorrent is a console-based BitTorrent client. It aims to be a
fully-featured and efficient client with the ability to run in the
@@ -54,40 +59,52 @@
--disable-manual \
--disable-shared \
--enable-ipv6 \
- --enable-ldaps \
--enable-static \
--without-libssh2 \
--without-ssl \
--with-ca-bundle="%{_sysconfdir}/pki/tls/certs/ca-bundle.crt" \
--with-gssapi="%{_prefix}/kerberos" \
- --with-libidn \
- --with-nss
-# --libdir="$RESULT_DIR/usr/%{_lib}" \
+ --with-libidn
%{__make} %{?_smp_mflags} CFLAGS="%{optflags}" install
popd
-# Build rtorrent
-PKG_CONFIG_PATH="$RESULT_DIR/usr/%{_lib}/pkgconfig:$PKG_CONFIG_PATH" ; export PKG_CONFIG_PATH
+### Build rtorrent
+PKG_CONFIG_PATH="$RESULT_DIR/lib/pkgconfig:$PKG_CONFIG_PATH" ; export PKG_CONFIG_PATH
+%endif
+
+### Avoid el5 gcc bug
+%{?el5:export CFLAGS="$CFLAGS -pthread"}
+%{?el5:export CXXFLAGS="$CXXFLAGS -pthread"}
+%ifarch i386
+%{?el5:export CFLAGS="$CFLAGS -march=i486"}
+%{?el5:export CXXFLAGS="$CXXFLAGS -march=i486"}
%endif
-%configure
+%configure --with-xmlrpc-c
%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}"
+### Manually install the man page to correct location for this release
+%{__install} -p -m 0644 -D ./doc/rtorrent.1 %{buildroot}/%{_mandir}/man1/rtorrent.1
+
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-#%doc %{_mandir}/man1/rtorrent.1*
+%doc %{_mandir}/man1/rtorrent.1*
%{_bindir}/rtorrent
+
%changelog
+* Thu Aug 18 2011 Denis Fateyev <[email protected]> - 0.8.9-2
+- Some fixes in spec for rtorrent-0.8.9
+
* Mon Aug 01 2011 Dag Wieers <[email protected]> - 0.8.9-1
- Updated to release 0.8.9.
_______________________________________________
users mailing list
[email protected]
http://lists.repoforge.org/mailman/listinfo/users
