rpms/kdemultimedia/F-10 .cvsignore, 1.58, 1.59 kdemultimedia.spec, 1.129, 1.130 sources, 1.61, 1.62

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28492/F-10

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	5 Mar 2009 02:51:14 -0000	1.58
+++ .cvsignore	2 Apr 2009 15:04:28 -0000	1.59
@@ -1 +1 @@
-kdemultimedia-4.2.1.tar.bz2
+kdemultimedia-4.2.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdemultimedia.spec	27 Feb 2009 17:01:11 -0000	1.129
+++ kdemultimedia.spec	2 Apr 2009 15:04:28 -0000	1.130
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.2.1
-Release: 1%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -26,9 +26,6 @@
 BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel libxcb-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
@@ -89,12 +86,22 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -144,7 +151,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Sun Feb 22 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	27 Feb 2009 17:01:11 -0000	1.61
+++ sources	2 Apr 2009 15:04:28 -0000	1.62
@@ -1 +1 @@
-d3916cb7a0dd5cb4e230e5c19d99563b  kdemultimedia-4.2.1.tar.bz2
+ebdf9ccc9eae935eda5f78d56773ee9a  kdemultimedia-4.2.2.tar.bz2