rpms/kdebase-runtime/devel kdebase-runtime.spec,1.98,1.99

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8239

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Fri Mar 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
- flags subpkg
- optimize scriptlets



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- kdebase-runtime.spec	3 Mar 2009 10:31:07 -0000	1.98
+++ kdebase-runtime.spec	27 Mar 2009 15:14:43 -0000	1.99
@@ -1,12 +1,14 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
+%else
+%define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -42,8 +44,6 @@
 
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
@@ -86,6 +86,16 @@
 %description libs
 %{summary}.
 
+%package flags 
+Summary: Geopolitical flags
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description flags 
+%{summary}.
+
 %package -n oxygen-icon-theme
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
@@ -229,7 +239,7 @@
 %else
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
-rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png
+%{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png}
 # install this service for KDE 3 applications
 # NOTE: This is not a standard .desktop file, but an "almost standard" one
 #       installed into a KDE-3-specific directory, as usual for KDE 3 services,
@@ -248,32 +258,52 @@
 
 
 %post
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
+%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+
+%posttrans
+%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
+%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
+%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %if 0%{?icons}
 %post -n oxygen-icon-theme
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans -n oxygen-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun -n oxygen-icon-theme
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
 %endif
 
 %if 0%{?icons_svg}
 %post -n oxygen-icon-theme-scalable
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans -n oxygen-icon-theme-scalable
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun -n oxygen-icon-theme-scalable
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
 %endif
 
 
@@ -310,6 +340,7 @@
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/
+%{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
@@ -322,6 +353,12 @@
 %{_kde4_libdir}/kde4/plugins/styles/
 %endif
 
+%if 0%{?flags}
+%files flags
+%defattr(-,root,root,-)
+%{_kde4_datadir}/locale/l10n/*/flag.png
+%endif
+
 %if 0%{?icons}
 %files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
 %defattr(-,root,root,-)
@@ -336,6 +373,10 @@
 
 
 %changelog
+* Fri Mar 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
+- flags subpkg
+- optimize scriptlets
+
 * Tue Mar  3 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-2
 - fix PulseAudio cmake detection