rpms/frozen-bubble/F-12 frozen-bubble.spec,1.15,1.16

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/frozen-bubble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4898

Modified Files:
	frozen-bubble.spec 
Log Message:
* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 2.2.0-4
- Do not remove server user (#542423), per:
  http://fedoraproject.org/wiki/Packaging/UsersAndGroups



Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/F-12/frozen-bubble.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- frozen-bubble.spec	24 Jul 2009 23:13:45 -0000	1.15
+++ frozen-bubble.spec	1 Dec 2009 11:04:31 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
 Version: 2.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
@@ -15,6 +15,7 @@ BuildRequires: perl-SDL >= 2.1.3, SDL_mi
 BuildRequires: glib2-devel, gettext, desktop-file-utils
 Requires: perl-SDL >= 2.1.3
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: hicolor-icon-theme
 
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
@@ -110,17 +111,17 @@ desktop-file-install \
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %post server
 /usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} fbubble \
@@ -134,7 +135,6 @@ if [ $1 -eq 0 ]; then
 fi
 
 %postun server
-/usr/sbin/userdel fbubble || :
 if [ $1 -ge 1 ]; then
     /sbin/service fb-server condrestart &>/dev/null || :
 fi
@@ -161,6 +161,10 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 2.2.0-4
+- Do not remove server user (#542423), per:
+  http://fedoraproject.org/wiki/Packaging/UsersAndGroups
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild