From 30fbd15e92fc1c26a481e68d88bf2983abff88ba Mon Sep 17 00:00:00 2001
From: Rahul Sundaram <sundaram@fedoraproject.org>
Date: Feb 10 2010 16:51:42 +0000
Subject: - rhbz #563090 - fixed config for daemon initscript


---

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.spec b/transmission.spec
index 79849b0..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}
@@ -121,6 +127,7 @@ rm -rf %{buildroot}
 /sbin/chkconfig --add transmission-daemon
 
 %post gtk
+
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database > /dev/null 2>&1 || :
@@ -161,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*
 
@@ -176,8 +184,11 @@ update-desktop-database > /dev/null 2>&1 || :
 %{_datadir}/applications/qtr.desktop
 
 %changelog
-* Fri Feb 5 2010 Ankur Sinha <ankursinha@fedoraproject.org> 1.83-2
-- Corrected daemon init script
+* 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
 
 * Sun Jan 31 2010 Ankur Sinha <ankursinha@fedoraproject.org> - 1.83-1
 - New Release
@@ -192,8 +203,8 @@ update-desktop-database > /dev/null 2>&1 || :
 * Mon Jan 25 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.82-2
 - Fix icon cache 
 
-* Sun Jan 24 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.82-1
-- Few important bug fixes
+* Sun Jan 24 2010 Ankur Sinha <ankursinha@fedoraproject.org> - 1.82-1
+- Bugfix
 - http://trac.transmissionbt.com/wiki/Changes#version-1.82
 
 * Thu Jan 21 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.80-1