rpms/kdeadmin/F-10 .cvsignore, 1.55, 1.56 kdeadmin.spec, 1.117, 1.118 sources, 1.59, 1.60

[Rex Dieter]

Author: rdieter

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	24 Jan 2009 06:33:12 -0000	1.55
+++ .cvsignore	3 Apr 2009 02:14:32 -0000	1.56
@@ -1,5 +1 @@
-kdeadmin-4.1.2.tar.bz2
-kdeadmin-4.1.80.tar.bz2
-kdeadmin-4.1.85.tar.bz2
-kdeadmin-4.1.96.tar.bz2
-kdeadmin-4.2.0.tar.bz2
+kdeadmin-4.2.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kdeadmin.spec	27 Feb 2009 15:09:11 -0000	1.117
+++ kdeadmin.spec	3 Apr 2009 02:14:32 -0000	1.118
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -19,8 +19,8 @@
 BuildRequires:  PyKDE4-devel >= %{version}
 BuildRequires:  system-config-printer-libs
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
@@ -35,8 +35,6 @@
 Summary: An RPM package manager
 Group: Applications/System
 Requires: smart
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description kpackage
 Kpackage is an RPM package manager, used for displaying currently installed
 packages, uninstalling them and installing new ones.
@@ -64,7 +62,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -81,16 +79,29 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 %post kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans kpackage
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
 
 
 %files
@@ -133,7 +144,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-1
+- optimize scriptlets 
+
+* Mon Mar 30 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
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	27 Feb 2009 15:09:11 -0000	1.59
+++ sources	3 Apr 2009 02:14:32 -0000	1.60
@@ -1 +1 @@
-11dde15ee5150357801c245d1290f38d  kdeadmin-4.2.1.tar.bz2
+b9104de38fa36962a2812aa9cae8fc5f  kdeadmin-4.2.2.tar.bz2