From 6e69fe300eb200e9b5598c732717c36471d3e6b5 Mon Sep 17 00:00:00 2001
From: Rahul Sundaram <sundaram@fedoraproject.org>
Date: Wed, 10 Feb 2010 16:33:57 +0000
Subject: [PATCH] - rhbz #563090 - fixed config for daemon initscript

---
 transmission-daemon-init      |  7 ++++++-
 transmission-daemon-sysconfig |  5 +++++
 transmission.spec             | 12 +++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 transmission-daemon-sysconfig

diff --git a/transmission-daemon-init b/transmission-daemon-init
index 7e2871b..73baa0c 100755
--- a/transmission-daemon-init
+++ b/transmission-daemon-init
@@ -6,7 +6,7 @@
 # description: Start up transmission-daemon
 #
 # processname: transmission-daemon
-# config: /etc/sysconfig/transmission
+# config: /etc/sysconfig/transmission-daemon
 
 # source function library
 . /etc/rc.d/init.d/functions
@@ -22,6 +22,11 @@ TRANSMISSION_HOME=/var/lib/transmission
 DAEMON_USER="transmission"
 DAEMON_ARGS="-T --blocklist -g $TRANSMISSION_HOME/.config/transmission"
 
+
+# Config overrides
+[ -f /etc/sysconfig/transmission-daemon ] && .
+/etc/sysconfig/transmission-daemon
+
 # Daemon
 NAME=transmission-daemon
 
diff --git a/transmission-daemon-sysconfig b/transmission-daemon-sysconfig
new file mode 100644
index 0000000..62269c6
--- /dev/null
+++ b/transmission-daemon-sysconfig
@@ -0,0 +1,5 @@
+# example configuration file
+
+# TRANSMISSION_HOME=/home/foo
+# DAEMON_USER="foo"
+# DAEMON_ARGS="-T --blocklist -g $TRANSMISSION_HOME/.config/transmission-daemon"
diff --git a/transmission.spec b/transmission.spec
index e18e1c4..6966de6 100644
--- a/transmission.spec
+++ b/transmission.spec
@@ -1,6 +1,6 @@
 Name:           transmission
 Version:        1.83
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -12,6 +12,8 @@ Source0:        http://download.m0k.org/transmission/files/transmission-%{versio
 Source1:        qtr.desktop
 # init script. Upstream doesn't want it because it is distro specific
 Source2:        transmission-daemon-init
+# 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
@@ -102,7 +104,11 @@ popd
 
 %install
 mkdir -p %{buildroot}%{_initddir}
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+
 install -m755 %{SOURCE2} %{buildroot}%{_initddir}/transmission-daemon
+install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/transmission-daemon
+
 mkdir -p %{buildroot}/var/lib/transmission
 
 make install DESTDIR=%{buildroot}
@@ -162,6 +168,7 @@ update-desktop-database > /dev/null 2>&1 || :
 %defattr(-, root, root, -)
 %{_bindir}/transmission-daemon
 %{_initddir}/transmission-daemon
+%{_sysconfdir}/sysconfig/transmission-daemon
 %attr(-,transmission, transmission)/var/lib/transmission/
 %doc %{_mandir}/man1/transmission-daemon*
 
@@ -177,6 +184,9 @@ update-desktop-database > /dev/null 2>&1 || :
 %{_datadir}/applications/qtr.desktop
 
 %changelog
+* Wed Feb 10 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.83-3
+- rhbz #563090 - fixed config for daemon initscript
+
 * Wed Feb 3 2010 Ankur Sinha <ankursinha@fedoraproject.org> - 1.83-2
 - Bugfix - #560180 - changed init script