[packages/rtorrent] Fix build with automake 1.13, added systemd service (not enabled by default, add tmux R)

wiget wiget at pld-linux.org
Mon Mar 18 18:56:52 CET 2013


commit 824ecbebb6677971651187c527e52d27cae24e78
Author: Artur Frysiak <artur at frysiak.net>
Date:   Mon Mar 18 10:10:45 2013 +0100

    Fix build with automake 1.13, added systemd service (not enabled by default, add tmux R)

 am.patch               | 11 +++++++++++
 rtorrent-tmux at .service | 12 ++++++++++++
 rtorrent.spec          | 10 ++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/rtorrent.spec b/rtorrent.spec
index 82088ba..6119fa4 100644
--- a/rtorrent.spec
+++ b/rtorrent.spec
@@ -12,16 +12,18 @@ Summary(pl.UTF-8):	rTorrent - konsolowy klient BitTorrenta
 Name:		rtorrent
 # keep stable line, see URL below
 Version:	0.9.2
-Release:	2
+Release:	3
 Epoch:		5
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 # Source0-md5:	72c3e9ab859bda7cc8aa96c0b508b09f
+Source1:	rtorrent-tmux at .service
 Patch0:		%{name}-colors.patch
 Patch1:		%{name}-ssl-no-verify.patch
 Patch2:		%{name}-ip_filter.patch
 Patch3:		%{name}-build.patch
+Patch4:		am.patch
 URL:		http://libtorrent.rakshasa.no/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -38,6 +40,7 @@ BuildRequires:	sqlite3-devel
 BuildRequires:	xmlrpc-c-devel >= 1.14.2
 %endif
 BuildRequires:	zlib-devel
+Suggests:	tmux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,6 +63,7 @@ screena. Obsługuje szybkie wznawianie i zarządzanie sesjami.
 # broke, see TODO
 #%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -77,12 +81,13 @@ screena. Obsługuje szybkie wznawianie i zarządzanie sesjami.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{systemdunitdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -p doc/rtorrent.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,3 +97,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README doc/rtorrent.rc
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/rtorrent.1*
+%{systemdunitdir}/*.service
diff --git a/am.patch b/am.patch
new file mode 100644
index 0000000..f3136f0
--- /dev/null
+++ b/am.patch
@@ -0,0 +1,11 @@
+--- rtorrent-0.9.2/configure.ac.wiget	2013-03-18 10:07:05.357628787 +0100
++++ rtorrent-0.9.2/configure.ac	2013-03-18 10:07:15.690528914 +0100
+@@ -3,7 +3,7 @@ AC_INIT(rtorrent, 0.9.2, jaris at ifi.uio.n
+ AC_DEFINE(API_VERSION, 6, api version)
+ 
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ AM_PATH_CPPUNIT(1.9.6)
+ 
+ AC_PROG_CXX
diff --git a/rtorrent-tmux at .service b/rtorrent-tmux at .service
new file mode 100644
index 0000000..eb762c8
--- /dev/null
+++ b/rtorrent-tmux at .service
@@ -0,0 +1,12 @@
+[Unit]
+Description=rTorrent in detached tmux session
+
+[Service]
+Type=forking
+User=%I
+Environment=TMPDIR=%h/tmp
+ExecStart=/usr/bin/tmux new-session -d -s rtorrent rtorrent
+ExecStop=/usr/bin/tmux send-keys -t rtorrent C-q
+
+[Install]
+WantedBy=multi-user.target
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rtorrent.git/commitdiff/824ecbebb6677971651187c527e52d27cae24e78



More information about the pld-cvs-commit mailing list