rpms/kdebase/F-10 kdebase.spec, 1.361, 1.362 sources, 1.107, 1.108 kdebase-4.2.1-konsole-layout-regression.patch, 1.1, NONE kdebase-4.2.1-konsole-selection.patch, 1.1, NONE
Lukas Tinkl
ltinkl at fedoraproject.org
Fri Apr 3 12:26:17 UTC 2009
- Previous message (by thread): rpms/python-vobject/devel .cvsignore, 1.15, 1.16 python-vobject.spec, 1.21, 1.22 sources, 1.15, 1.16
- Next message (by thread): rpms/kdebase/F-9 kdebase.spec, 1.351, 1.352 sources, 1.102, 1.103 kdebase-4.2.1-konsole-layout-regression.patch, 1.1, NONE kdebase-4.2.1-konsole-selection.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13844/F-10
Modified Files:
kdebase.spec sources
Removed Files:
kdebase-4.2.1-konsole-layout-regression.patch
kdebase-4.2.1-konsole-selection.patch
Log Message:
sync with devel/
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- kdebase.spec 9 Mar 2009 22:21:16 -0000 1.361
+++ kdebase.spec 3 Apr 2009 12:25:46 -0000 1.362
@@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Core Files
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdebase
@@ -29,8 +29,6 @@
Patch2: kdebase-4.2.1-home-icon.patch
# upstream patches
-Patch100: kdebase-4.2.1-konsole-selection.patch
-Patch101: kdebase-4.2.1-konsole-layout-regression.patch
%ifnarch s390 s390x
Requires: eject
@@ -127,9 +125,6 @@
%patch1 -p1 -b .konsole-session
%patch2 -p1 -b .home-icon
-%patch100 -p1 -b .konsole
-%patch101 -p1 -b .layout-regression
-
# fix incorrect assumption that we're building in a combined kdebase tree
sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -253,19 +248,29 @@
%post
%{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+%if "%{name}" == "kdebase"
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
%endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
%postun
%{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
%if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
%endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+fi
%if 0%{?libs}
%post libs -p /sbin/ldconfig
@@ -310,6 +315,12 @@
%changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+- optimize scriptlets
+
+* Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
* Mon Mar 09 2009 Than Ngo <than at redhat.com> - 4.2.1-3
- apply patch to fix regression in konsole, layout regression affecting apps
using the KPart
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- sources 27 Feb 2009 15:38:33 -0000 1.107
+++ sources 3 Apr 2009 12:25:46 -0000 1.108
@@ -1 +1 @@
-a8f391db7b98feaa6ae81b8f1e99ed5a kdebase-4.2.1.tar.bz2
+7f6b0d5051f251d0f34ee797a8e2b54a kdebase-4.2.2.tar.bz2
--- kdebase-4.2.1-konsole-layout-regression.patch DELETED ---
--- kdebase-4.2.1-konsole-selection.patch DELETED ---
- Previous message (by thread): rpms/python-vobject/devel .cvsignore, 1.15, 1.16 python-vobject.spec, 1.21, 1.22 sources, 1.15, 1.16
- Next message (by thread): rpms/kdebase/F-9 kdebase.spec, 1.351, 1.352 sources, 1.102, 1.103 kdebase-4.2.1-konsole-layout-regression.patch, 1.1, NONE kdebase-4.2.1-konsole-selection.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list