add systemd unit (#659919)

drop sysconfig file

clog

@@ -1 +1,2 @@
-Rebuilt for rpm (#728707)
+add systemd unit (#659919)
+drop sysconfig file

transmission-daemon-init

@@ -1,102 +0,0 @@
-#!/bin/bash
-#
-# This is a modified version of the original init script at 
-# http://jasonfriedland.blogspot.com/2009/07/init-script-for-transmission-daemon-on.html
-# chkconfig: - 16 84
-# description: Start up transmission-daemon
-#
-# processname: transmission-daemon
-# config: /etc/sysconfig/transmission-daemon
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-# Get network config
-. /etc/sysconfig/network
-
-[ "${NETWORKING}" = "no" ] && exit 0
-
-# Defaults
-TRANSMISSION_HOME=/var/lib/transmission
-
-DAEMON_USER="transmission"
-DAEMON_ARGS="-T --blocklist -g $TRANSMISSION_HOME/.config/transmission"
-
-
-# Config overrides
-
-if [ -f /etc/sysconfig/transmission-daemon ]; then
-        . /etc/sysconfig/transmission-daemon
-fi
-# Daemon
-NAME=transmission-daemon
-
-DAEMON=$(which $NAME)
-DAEMON_PIDFILE=/var/run/$NAME.pid
-DAEMON_LOCKFILE=/var/lock/subsys/$NAME
-DAEMON_SCRIPTNAME=/etc/init.d/$NAME
-DAEMON_LOGFILE=/var/log/$NAME.log
-
-[ -x "$DAEMON" ] || exit 0
-
-start() {
-    echo -n $"Starting ${NAME}: "
-    
-    if [ -n "$TRANSMISSION_HOME" ]; then
-        export TRANSMISSION_HOME
-    fi
-    
-    daemon --check $DAEMON --user $DAEMON_USER $DAEMON $DAEMON_ARGS
-
-    sleep 2
-
-    status $NAME &> /dev/null && echo_success || echo_failure
-    RETVAL=$?
-
-    if [ $RETVAL -eq 0 ]; then
-        touch $DAEMON_LOCKFILE
-        pidof -o %PPID -x $NAME > $DAEMON_PIDFILE
-    fi
-
-    echo
-}
-
-stop() {
-    echo -n $"Shutting down ${NAME}: "
-    
-    killproc $NAME
-    RETVAL=$?
-
-    [ $RETVAL -eq 0 ] && /bin/rm -f $DAEMON_LOCKFILE $DAEMON_PIDFILE
-
-    echo
-}
-
-case "$1" in
-    start)
-        start
-    ;;
-    stop)
-        stop
-    ;;
-    restart|reload)
-        stop
-        start
-    ;;
-    condrestart|try-restart)
-        if [ -f $DAEMON_LOCKFILE ]; then
-            stop
-            start
-        fi
-    ;;
-    status)
-        status $NAME
-    ;;
-
-    *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|condrestart|status}" >&2
-        exit 3
-    ;;
-esac
-
-

transmission-daemon-sysconfig

@@ -1,5 +0,0 @@
-# example configuration file
-
-# TRANSMISSION_HOME=/home/foo
-# DAEMON_USER="foo"
-# DAEMON_ARGS="-T --blocklist -g $TRANSMISSION_HOME/.config/transmission-daemon"

transmission.spec

@@ -1,6 +1,6 @@
 Name:           transmission
 Version:        2.33
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -10,10 +10,8 @@ URL:            http://www.transmissionbt.com
 Source0:        http://download.transmissionbt.com/files/transmission-%{version}.tar.xz
 # This is intended to be merged by upstream post 1.80 release
 Source1:        transmission-qt.desktop
-# init script. Upstream doesn't want it because it is distro specific
+# systemd unit definition
-Source2:        transmission-daemon-init
+Source2:        transmission-daemon-systemd
-# Example conf file
-Source3:        transmission-daemon-sysconfig
 BuildRequires:  openssl-devel >= 0.9.4
 BuildRequires:  glib2-devel >= 2.15.5
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -58,10 +56,10 @@ Summary:       Transmission daemon
 Group:         Applications/Internet
 Requires:      transmission-common
 Requires(pre): shadow-utils
-Requires(post): chkconfig
+Requires(post): systemd-units
-Requires(preun): chkconfig
+Requires(preun): systemd-units
-Requires(preun): initscripts
+Requires(postun): systemd-units
-Requires(postun): initscripts
+BuildRequires: systemd-units
 Provides:      transmission = %{version}-%{release}
 %description daemon
 Transmission BitTorrent client daemon.
@@ -112,11 +110,9 @@ popd
 
 
 %install
-mkdir -p %{buildroot}%{_initddir}
+mkdir -p %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 
-install -m755 %{SOURCE2} %{buildroot}%{_initddir}/transmission-daemon
+install -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/transmission-daemon.service
-install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/transmission-daemon
 
 mkdir -p %{buildroot}/var/lib/transmission
 
@@ -134,7 +130,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1}
 touch --no-create %{_datadir}/icons/hicolor || :
 
 %post daemon
-/sbin/chkconfig --add transmission-daemon
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %post gtk
 update-desktop-database > /dev/null 2>&1 || :
@@ -144,8 +143,8 @@ update-desktop-database > /dev/null 2>&1 || :
 
 %preun daemon
 if [ $1 = 0 ] ; then
-    /sbin/service transmission-daemon stop >/dev/null 2>&1
+    /bin/systemctl stop transmission-daemon.service >/dev/null 2>&1 || :
-    /sbin/chkconfig --del transmission-daemon
+    /bin/systemctl disable transmission-daemon.service >/dev/null 2>&1 || :
 fi
 
 %postun common
@@ -155,8 +154,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 fi
 
 %postun daemon
-if [ "$1" -ge "1" ] ; then
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-    /sbin/service transmission-daemon condrestart >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart transmission-daemon.service >/dev/null 2>&1 || :
 fi
 
 %postun gtk
@@ -191,8 +192,7 @@ update-desktop-database > /dev/null 2>&1 || :
 
 %files daemon
 %{_bindir}/transmission-daemon
-%{_initddir}/transmission-daemon
+%{_unitdir}/transmission-daemon.service
-%config(noreplace) %{_sysconfdir}/sysconfig/transmission-daemon
 %attr(-,transmission, transmission)/var/lib/transmission/
 %doc %{_mandir}/man1/transmission-daemon*
 
@@ -207,6 +207,10 @@ update-desktop-database > /dev/null 2>&1 || :
 %doc %{_mandir}/man1/transmission-qt.*
 
 %changelog
+* Sat Sep 10 2011 Tomasz Torcz <ttorcz@fedoraproject.org> - 2.33-2
+- add systemd unit (#659919)
+- drop sysconfig file
+
 * Sun Aug 14 2011 Rex Dieter <rdieter@fedoraproject.org> - 2.33-1.1
 - Rebuilt for rpm (#728707)