rpms/bittorrent/F-8 bittorrent.spec, 1.43, 1.44 btseed.init, 1.7, 1.8 bttrack.init, 1.6, 1.7

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/pkgs/rpms/bittorrent/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12682/F-8

Modified Files:
	bittorrent.spec btseed.init bttrack.init 
Log Message:
* Fri Aug 15 2008 Paul Howarth <paul at city-fan.org> 4.4.0-7
- Use new scriptlets for user/group creation
- Fix up torrent homedir silently (#457563)
- Create a pidfile for btseed (#458926)
- Remove tracker pidfile when service is stopped (no need to include the
  %ghost-ed pidfile now)
- Use %{_initrddir} instead of %{_sysconfdir}/rc.d/init.d
- Call initscripts directly instead of via /sbin/service to reduce scriptlet
  dependencies



Index: bittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-8/bittorrent.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- bittorrent.spec	9 Apr 2008 14:56:29 -0000	1.43
+++ bittorrent.spec	15 Aug 2008 11:26:58 -0000	1.44
@@ -9,7 +9,7 @@
 Summary:	BitTorrent swarming network file transfer tool
 Name:		bittorrent
 Version:	4.4.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent
 URL:		http://www.bittorrent.com/
@@ -33,12 +33,9 @@
 Provides:	python-khashmir = %{version}-%{release}
 Obsoletes:	python-khashmir < %{version}-%{release}
 
-Requires(pre): /usr/sbin/useradd /usr/sbin/usermod
+Requires(pre): /usr/bin/getent /usr/sbin/groupadd /usr/sbin/useradd /usr/sbin/usermod
 Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
 
 %description
 BitTorrent is a tool for distributing files. It's extremely easy to use -
@@ -145,8 +142,8 @@
 %{__install} -d %{buildroot}%{bt_datadir}
 %{__install} -d %{buildroot}%{bt_statedir}
 %{__install} -d %{buildroot}%{_localstatedir}/{run,log/bittorrent}
-%{__install} -m 0755 -D btseed.init %{buildroot}%{_sysconfdir}/rc.d/init.d/btseed
-%{__install} -m 0755 -D bttrack.init %{buildroot}%{_sysconfdir}/rc.d/init.d/bttrack
+%{__install} -m 0755 -D btseed.init %{buildroot}%{_initrddir}/btseed
+%{__install} -m 0755 -D bttrack.init %{buildroot}%{_initrddir}/bttrack
 %{__install} -m 0644 -D bittorrent.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/bittorrent
 %{__install} -m 0644 -D bittorrent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/bittorrent
 %{__install} -m 0644 -D bittorrent.png \
@@ -154,8 +151,6 @@
 # pidof doesn't find scripts with hyphenated names, so make some convenience links for initscripts
 %{__ln_s} bittorrent-tracker %{buildroot}%{_bindir}/bttrack
 %{__ln_s} launchmany-console %{buildroot}%{_bindir}/btseed
-# ghost the tracker pidfile so it goes on package removal
-: > %{buildroot}%{_localstatedir}/run/bittorrent-tracker.pid
 %{find_lang} bittorrent
 # include egg-info if present
 if [ -f %{buildroot}%{python_sitelib}/BitTorrent-%{version}-*.egg-info ]; then
@@ -167,10 +162,13 @@
 %{__rm} -rf %{buildroot}
 
 %pre
-/usr/sbin/useradd -r -s /sbin/nologin -d %{bt_dir} \
-	-c "BitTorrent Seed/Tracker" torrent &>/dev/null || :
+/usr/bin/getent group torrent >/dev/null || /usr/sbin/groupadd -r torrent
+/usr/bin/getent passwd torrent >/dev/null || \
+	/usr/sbin/useradd -r -s /sbin/nologin -d %{bt_dir} -g torrent \
+		-c "BitTorrent Seed/Tracker" torrent
 # Fix homedir for upgrades
-/usr/sbin/usermod --home %{bt_dir} torrent
+/usr/sbin/usermod --home %{bt_dir} torrent &>/dev/null
+exit 0
 
 %post
 /sbin/chkconfig --add btseed  || :
@@ -178,16 +176,16 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service btseed  stop &>/dev/null || :
-	/sbin/service bttrack stop &>/dev/null || :
+	%{_initrddir}/btseed  stop &>/dev/null || :
+	%{_initrddir}/bttrack stop &>/dev/null || :
 	/sbin/chkconfig --del btseed  || :
 	/sbin/chkconfig --del bttrack || :
 fi
 
 %postun
 if [ $1 -gt 0 ]; then
-	/sbin/service btseed  condrestart &>/dev/null || :
-	/sbin/service bttrack condrestart &>/dev/null || :
+	%{_initrddir}/btseed  condrestart &>/dev/null || :
+	%{_initrddir}/bttrack condrestart &>/dev/null || :
 fi
 
 %post gui
@@ -218,9 +216,8 @@
 %attr(-,torrent,torrent) %dir %{bt_datadir}/
 %attr(-,torrent,torrent) %dir %{bt_statedir}/
 %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent/
-%ghost %{_localstatedir}/run/bittorrent-tracker.pid
-%{_sysconfdir}/rc.d/init.d/btseed
-%{_sysconfdir}/rc.d/init.d/bttrack
+%{_initrddir}/btseed
+%{_initrddir}/bttrack
 %config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent
 %config(noreplace) %{_sysconfdir}/sysconfig/bittorrent
 
@@ -232,6 +229,16 @@
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 
 %changelog
+* Fri Aug 15 2008 Paul Howarth <paul at city-fan.org> 4.4.0-7
+- Use new scriptlets for user/group creation
+- Fix up torrent homedir silently (#457563)
+- Create a pidfile for btseed (#458926)
+- Remove tracker pidfile when service is stopped (no need to include the
+  %%ghost-ed pidfile now)
+- Use %%{_initrddir} instead of %%{_sysconfdir}/rc.d/init.d
+- Call initscripts directly instead of via /sbin/service to reduce scriptlet
+  dependencies
+
 * Tue Apr  8 2008 Paul Howarth <paul at city-fan.org> 4.4.0-6
 - Default data directory moved back out of /srv
   (to %%{_localstatedir}/lib/bittorrent)


Index: btseed.init
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-8/btseed.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- btseed.init	9 Apr 2008 14:56:29 -0000	1.7
+++ btseed.init	15 Aug 2008 11:26:58 -0000	1.8
@@ -34,18 +34,20 @@
 	echo -n $"Starting BitTorrent seed client: "
 	/sbin/runuser -s /bin/sh -c "$prog $SEEDOPTS $SEEDDIR" $btuser >> $SEEDLOG 2>&1 &
 	disown -ar
-	usleep 500000
+	/bin/usleep 500000
 	status btseed &> /dev/null && echo_success || echo_failure
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed
+	if [ $RETVAL -eq 0 ]; then
+		/bin/touch /var/lock/subsys/btseed
+		/sbin/pidof -o %PPID -x btseed > /var/run/btseed.pid
+	fi
 	echo
 	;;
   stop)
 	echo -n $"Shutting down BitTorrent seed client: "
 	killproc $prog
-	#killproc "/usr/bin/python $prog"
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed
+	[ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/btseed /var/run/btseed.pid
 	echo
 	;;
   restart|reload)


Index: bttrack.init
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-8/bttrack.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bttrack.init	9 Apr 2008 14:56:29 -0000	1.6
+++ bttrack.init	15 Aug 2008 11:26:58 -0000	1.7
@@ -37,7 +37,7 @@
 		--dfile $TRACKSTATEFILE --logfile $TRACKLOG $TRACKOPTS \
 		--allowed_dir $TRACKDIR" $btuser &> /dev/null &
 	disown -ar
-	usleep 500000
+	/bin/usleep 500000
 	status bttrack &> /dev/null && echo_success || echo_failure
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack
@@ -46,9 +46,9 @@
   stop)
 	echo -n $"Shutting down BitTorrent tracker: "
 	killproc $prog
-	#killproc "/usr/bin/python $prog"
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack
+	[ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/bttrack \
+		/var/run/bittorrent-tracker.pid
 	echo
 	;;
   restart|reload)