rpms/bittorrent/devel bittorrent.spec,1.16,1.17

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26134

Modified Files:
	bittorrent.spec 
Log Message:
- don't delete user/group torrent on uninstall
  (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html)



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bittorrent.spec	2 Jun 2005 11:57:13 -0000	1.16
+++ bittorrent.spec	6 Jun 2005 10:09:48 -0000	1.17
@@ -1,4 +1,5 @@
 %define desktopvendor fedora
+%define delete_user_on_uninstall 0
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -27,8 +28,10 @@
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+%if %{delete_user_on_uninstall}
 Requires(postun): %{_sbindir}/userdel
 Requires(postun): %{_sbindir}/groupdel
+%endif
 Requires(postun): /sbin/service
 
 %description
@@ -144,12 +147,14 @@
 fi
 
 %postun
-if [ $1 -eq 0 ]; then
-	%{_sbindir}/userdel  torrent &>/dev/null || :
-	%{_sbindir}/groupdel torrent &>/dev/null || :
-else
+if [ $1 -gt 0 ]; then
 	/sbin/service btseed  condrestart &>/dev/null || :
 	/sbin/service bttrack condrestart &>/dev/null || :
+%if %{delete_user_on_uninstall}
+else
+	%{_sbindir}/userdel  torrent &>/dev/null || :
+	%{_sbindir}/groupdel torrent &>/dev/null || :
+%endif
 fi
 
 %post gui
@@ -197,6 +202,10 @@
 %{_datadir}/pixmaps/bittorrent.png
 
 %changelog
+* Mon Jun  6 2005 Paul Howarth <paul at city-fan.org> 4.1.1-3%{?dist}
+- don't delete user/group torrent on uninstall
+  (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html)
+
 * Thu Jun  2 2005 Paul Howarth <paul at city-fan.org> 4.1.1-2%{?dist}
 - tidy up description text
 - improved initscripts (#158273)