rpms/kdebase-runtime/F-9 .cvsignore, 1.18, 1.19 kdebase-runtime.spec, 1.67, 1.68 sources, 1.22, 1.23

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12857

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- -flags subpkg
- koji/noarch hacks dropped



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Feb 2009 15:54:13 -0000	1.18
+++ .cvsignore	1 Apr 2009 23:17:00 -0000	1.19
@@ -1 +1 @@
-kdebase-runtime-4.2.0.tar.bz2
+kdebase-runtime-4.2.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdebase-runtime.spec	3 Mar 2009 10:31:06 -0000	1.67
+++ kdebase-runtime.spec	1 Apr 2009 23:17:00 -0000	1.68
@@ -1,12 +1,14 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%define kde3_desktop 1
+%global kde3_desktop 1
+%else
+%define flags 1 
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.2.1
-Release:       2%{?dist}
+Version:       4.2.2
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -21,17 +23,19 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
-Patch100:      kdebase-runtime-4.2.1-pulseaudio-cmake.patch
 
-%ifarch noarch
-%define icons 1
-%define icons_svg 1
-%else
+#ifarch noarch
+## icons now provided by standalone oxygen-icon-theme
+#define icons 1
+#define icons_svg 1
+#else
 %define rest 1
-%endif
+#endif
 
 # when kdesu was removed, this is/should-be only temporary
+%if 0%{?fedora} < 11
 Conflicts: kdebase3 < 3.5.10-4
+%endif
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 #Â KHelpcenter requires htdig for building search indices
@@ -42,8 +46,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,10 +88,23 @@
 %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
 %{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme
 %{summary}.
 
@@ -97,6 +112,9 @@
 Summary: Oxygen icon theme, scalable(svg) icons
 Group: User Interface/Desktops
 Requires: oxygen-icon-theme = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
@@ -109,7 +127,6 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
-%patch100 -p1 -b .pulseaudio-cmake
 
 %build
 mkdir -p %{_target_platform}
@@ -229,7 +246,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,
@@ -247,33 +264,59 @@
 rm -rf %{buildroot}
 
 
+%if ! 0%{?kde3_desktop}
 %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 || :
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+
+%posttrans
+%if ! 0%{?kde3_desktop}
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+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
+%if ! 0%{?kde3_desktop}
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+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 +353,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 +366,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 +386,20 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- -flags subpkg
+- koji/noarch hacks dropped
+
+* Wed Apr 01 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch
+
+* Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Mar 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
+- flags subpkg (not enabled)
+- optimize scriptlets
+
 * Tue Mar  3 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-2
 - fix PulseAudio cmake detection
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	27 Feb 2009 15:52:27 -0000	1.22
+++ sources	1 Apr 2009 23:17:00 -0000	1.23
@@ -1 +1 @@
-93ef480ed5376ce02324d1b85b8bae0f  kdebase-runtime-4.2.1.tar.bz2
+cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2