rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.210, 1.211 kdebase-workspace-4.2.1-hotkey.patch, 1.1, NONE kdebase-workspace-4.2.1-kde#185585.patch, 1.1, NONE kdebase-workspace-4.2.1-kde#185736.patch, 1.1, NONE kdebase-workspace-4.2.1-powerdevil.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Apr 1 17:43:41 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28623
Modified Files:
kdebase-workspace.spec
Removed Files:
kdebase-workspace-4.2.1-hotkey.patch
kdebase-workspace-4.2.1-kde#185585.patch
kdebase-workspace-4.2.1-kde#185736.patch
kdebase-workspace-4.2.1-powerdevil.patch
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets
- drop upstreamed patches
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- kdebase-workspace.spec 31 Mar 2009 11:22:53 -0000 1.210
+++ kdebase-workspace.spec 1 Apr 2009 17:43:11 -0000 1.211
@@ -8,7 +8,7 @@
Name: kdebase-workspace
Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -42,16 +42,8 @@
Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
# from 4.3: http://bugs.kde.org/180576
Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-# 4.2 , http://bugs.kde.org/185736
-Patch104: kdebase-workspace-4.2.1-kde#185736.patch
#Â 4.3, https://bugs.kde.org/show_bug.cgi?id=184152
Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
-# 4.2, http://bugs.kde.org/185585
-Patch106: kdebase-workspace-4.2.1-kde#185585.patch
-# 4.2, http://bugs.kde.org/186992
-Patch107: kdebase-workspace-4.2.1-hotkey.patch
-# 4.2, http://bugs.kde.org/183273
-Patch108: kdebase-workspace-4.2.1-powerdevil.patch
# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
%if 0%{?fedora} == 9
@@ -94,8 +86,6 @@
Requires: %{name}-libs = %{version}-%{release}
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
# would much rather these deps be elsewhere,
# but adding here doesn't hurt either -- Rex
@@ -248,11 +238,7 @@
%patch101 -p0 -b .solid-bluetoothTrunkTo42
%endif
%patch103 -p1 -b .kde#180576
-%patch104 -p5 -b .kde#185736
%patch105 -p0 -b .desktopnumbers
-%patch106 -p0 -b .kde#185585
-%patch107 -p1 -b .kde#186992
-%patch108 -p1 -b .kde#183273
%build
@@ -294,14 +280,22 @@
%post
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 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
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 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
@@ -516,6 +510,10 @@
%changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+- drop upstreamed patches
+
* Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2
--- kdebase-workspace-4.2.1-hotkey.patch DELETED ---
--- kdebase-workspace-4.2.1-kde#185585.patch DELETED ---
--- kdebase-workspace-4.2.1-kde#185736.patch DELETED ---
--- kdebase-workspace-4.2.1-powerdevil.patch DELETED ---
More information about the scm-commits
mailing list