rpms/bittorrent/devel bittorrent.spec,1.22,1.23

[Paul Howarth (pghmcfc)]

Author: pghmcfc

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

Modified Files:
	bittorrent.spec 
Log Message:
* Tue Jul 11 2005 Paul Howarth <paul at city-fan.org> 4.1.2-5
- move icon to %{_datadir}/icons/hicolor/48x48/apps instead of
  %{_datadir}/pixmaps and update icon cache on installation if
  necessary (#162465)
- no need to set CFLAGS in %build for noarch package
- don't offer build option not to delete usr/group on uninstall
- don't generate redundant python-abi dependency for FC >= 4



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bittorrent.spec	7 Jul 2005 06:08:31 -0000	1.22
+++ bittorrent.spec	12 Jul 2005 15:33:43 -0000	1.23
@@ -1,11 +1,10 @@
 %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()")}
 
 Name:           bittorrent
 Version:        4.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -21,7 +20,10 @@
 
 BuildRequires:  python-devel desktop-file-utils gettext
 Requires:       python
+# FC4 and later auto-generate python version dependency
+%if "%{fedora}" < "4" || 0%{?rhel}
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+%endif
 
 Provides:	python-khashmir
 Obsoletes:	python-khashmir < %{version}-%{release}
@@ -31,10 +33,6 @@
 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
@@ -107,7 +105,7 @@
 EOF
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -121,7 +119,7 @@
 %{__install} -d $RPM_BUILD_ROOT%{bt_dir}
 %{__install} -d $RPM_BUILD_ROOT%{bt_statedir}
 %{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent
-%{__install} -m 0644 -D %{SOURCE2}        $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
+%{__install} -m 0644 -D %{SOURCE2}        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 %{__install} -m 0755 -D %{SOURCE3}        $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed
 %{__install} -m 0755 -D %{SOURCE4}        $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack
 %{__install} -m 0644 -D btseed.sysconfig  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed
@@ -153,18 +151,17 @@
 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
 %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 
 %postun gui
 %{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 
 %files -f bittorrent.lang
 %defattr(-,root,root,-)
@@ -202,9 +199,17 @@
 %{_bindir}/btmaketorrentgui.py
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 %{_datadir}/pixmaps/%{name}-%{version}
-%{_datadir}/pixmaps/bittorrent.png
+%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Jul 11 2005 Paul Howarth <paul at city-fan.org> 4.1.2-5
+- move icon to %{_datadir}/icons/hicolor/48x48/apps instead of
+  %{_datadir}/pixmaps and update icon cache on installation if
+  necessary (#162465)
+- no need to set CFLAGS in %%build for noarch package
+- don't offer build option not to delete usr/group on uninstall
+- don't generate redundant python-abi dependency for FC >= 4
+
 * Thu Jul  7 2005 Paul Howarth <paul at city-fan.org> 4.1.2-4
 - bump and rebuild