rpms/kdeadmin/devel kdeadmin.spec,1.127,1.128
Rex Dieter
rdieter at fedoraproject.org
Wed Apr 1 18:14:03 UTC 2009
- Previous message: rpms/kdelibs/F-9 .cvsignore, 1.58, 1.59 kdelibs.spec, 1.385, 1.386 sources, 1.71, 1.72
- Next message: rpms/kernel/F-11 kernel.spec, 1.1499, 1.1500 linux-2.6-acpi-video-didl-intel-outputs.patch, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3140
Modified Files:
kdeadmin.spec
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
- optimize scriptlets
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdeadmin.spec 31 Mar 2009 11:22:51 -0000 1.127
+++ kdeadmin.spec 1 Apr 2009 18:13:32 -0000 1.128
@@ -1,7 +1,7 @@
Name: kdeadmin
Epoch: 7
Version: 4.2.2
-Release: 1%{?dist}
+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,6 +144,9 @@
%changelog
+* 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
- Previous message: rpms/kdelibs/F-9 .cvsignore, 1.58, 1.59 kdelibs.spec, 1.385, 1.386 sources, 1.71, 1.72
- Next message: rpms/kernel/F-11 kernel.spec, 1.1499, 1.1500 linux-2.6-acpi-video-didl-intel-outputs.patch, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list