rpms/mt-daapd/EL-5 mt-daapd-0.2.4.2-fedora.patch, 1.1, 1.2 mt-daapd.spec, 1.11, 1.12

W. Michael Petullo mikep at fedoraproject.org
Sat Sep 27 02:18:21 UTC 2008


Author: mikep

Update of /cvs/extras/rpms/mt-daapd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5247

Modified Files:
	mt-daapd-0.2.4.2-fedora.patch mt-daapd.spec 
Log Message:
Fix init script.


mt-daapd-0.2.4.2-fedora.patch:

Index: mt-daapd-0.2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/EL-5/mt-daapd-0.2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mt-daapd-0.2.4.2-fedora.patch	15 May 2008 01:59:41 -0000	1.1
+++ mt-daapd-0.2.4.2-fedora.patch	27 Sep 2008 02:17:50 -0000	1.2
@@ -1,6 +1,6 @@
 diff -u --recursive mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd mt-daapd-0.2.4.2/contrib/mt-daapd
---- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-05-14 21:20:00.000000000 -0400
-+++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-05-14 21:30:07.000000000 -0400
+--- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-09-26 22:00:47.000000000 -0400
++++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-09-26 22:11:16.000000000 -0400
 @@ -1,6 +1,6 @@
  #!/bin/bash
  #
@@ -9,3 +9,36 @@
  # description: mt-daapd is a multi-threaded DAAP server for iTunes
  # processname: mt-daapd
  # pidfile: /var/run/mt-daapd
+@@ -10,25 +10,26 @@
+ . /etc/init.d/functions
+ [ -e /etc/daapd.conf ]
+ 
++mtdaapd=/usr/sbin/mt-daapd
++pidfile=/var/run/mt-daapd.pid
++lockfile=/var/lock/subsys/mt-daapd
+ RETVAL=0
+ 
+ start() {
+ 	echo -n $"Starting DAAP server: "
+-	daemon mt-daapd 
++	daemon --pidfile=${pidfile} $mtdaapd 
+ 	RETVAL=$?
+ 	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && touch ${lockfile}
+ }
+ 
+ stop() {
+ 	echo -n $"Shutting down DAAP server: "
+-	# This is broken.
+-	killall -INT mt-daapd
+-#	killproc mt-daapd
++	killproc -p ${pidfile} $mtdaapd
+ 	RETVAL=$?
+ 
+ 	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
+ }
+ 
+ case "$1" in


Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/EL-5/mt-daapd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mt-daapd.spec	16 May 2008 01:10:03 -0000	1.11
+++ mt-daapd.spec	27 Sep 2008 02:17:50 -0000	1.12
@@ -11,7 +11,7 @@
 Name: mt-daapd
 Epoch: 1
 Version: 0.2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
 
 %changelog
+* Fri Sep 26 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-3
+   - Update init script, fix Fedora Bugzilla #461719.
+
 * Thu May 15 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-2
    - Bump epoch.
 




More information about the fedora-extras-commits mailing list