rpms/kdebase-workspace/F-9 .cvsignore, 1.18, 1.19 kdebase-workspace.spec, 1.152, 1.153 sources, 1.24, 1.25 kdebase-workspace-4.1.80-session-button.patch, 1.1, NONE kdebase-workspace-4.2.4-krunner-tab.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9229/F-9

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.1.80-session-button.patch 
	kdebase-workspace-4.2.4-krunner-tab.patch 
Log Message:
Sync from F-10:

* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
- make default_leonidas.png the default face icon on F11

* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
- KDE 4.2.4

* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-6
- omit/revert session-button patch (kde#194506,rh#502953)

* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-5
- upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	1 Apr 2009 23:09:25 -0000	1.18
+++ .cvsignore	2 Jun 2009 10:28:28 -0000	1.19
@@ -1 +1 @@
-kdebase-workspace-4.2.2.tar.bz2
+kdebase-workspace-4.2.4.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- kdebase-workspace.spec	18 May 2009 13:41:01 -0000	1.152
+++ kdebase-workspace.spec	2 Jun 2009 10:28:28 -0000	1.153
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.3
+Version: 4.2.4
 
-Release: 4%{?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
@@ -25,7 +25,6 @@ Patch6: kdebase-workspace-4.0.3-timedate
 #Â 441062: packagekit tools do not show icons correctly on KDE
 Patch7: kdebase-workspace-4.0.3-krdb.patch
 Patch8: kdebase-workspace-4.0.72-klipper-url.patch
-Patch9: kdebase-workspace-4.1.80-session-button.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch12: kdebase-workspace-4.2.0-default_applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
@@ -46,10 +45,6 @@ Patch103: kdebase-workspace-4.2.0-kde#18
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
 # from 4.3: check for network avail. through Solid/NM in the weather dataengine
 Patch106: kdebase-workspace-4.2.3-weather-dataengine-nm.patch
-#Â Fix krunner TAB completion
-#Â http://websvn.kde.org/?view=rev&revision=961314
-Patch107: kdebase-workspace-4.2.4-krunner-tab.patch
-
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -66,7 +61,7 @@ Obsoletes: kdmtheme < 1.3
 # -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
 # -> powerdevel upgrade path
-Obsoletes: guidance-power-manager < 4.2.0-10
+Obsoletes: guidance-power-manager < 4.3
 %endif
 
 BuildRequires: bluez-libs-devel
@@ -112,8 +107,13 @@ Requires: xorg-x11-server-utils
 %define default_face_icon default_solar.png
 Requires: solar-kde-theme
 %else
+%if 0%{?fedora} == 11
+%define default_face_icon default_leonidas.png
+Requires: leonidas-kde-theme
+%else
 %define default_face_icon default1.png
 %endif
+%endif
 
 Requires: kio_sysinfo
 
@@ -227,7 +227,6 @@ popd
 %patch6 -p0 -b .timedate-kcm
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
-%patch9 -p1 -b .session-button
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
 %patch13 -p1 -b .pykde4
@@ -245,7 +244,6 @@ popd
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
 %patch106 -p1 -b .weather-dataengine-nm
-%patch107 -p1 -b .krunner-tab
 
 %build
 
@@ -520,6 +518,18 @@ fi
 
 
 %changelog
+* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
+- make default_leonidas.png the default face icon on F11
+
+* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
+- KDE 4.2.4
+
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-6
+- omit/revert session-button patch (kde#194506,rh#502953)
+
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-5
+- upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)
+
 * Mon May 18 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.3-4
 - fix TAB completion in krunner
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	6 May 2009 12:26:58 -0000	1.24
+++ sources	2 Jun 2009 10:28:28 -0000	1.25
@@ -1 +1 @@
-f58d388883d73c69a0a719819625b171  kdebase-workspace-4.2.3.tar.bz2
+72f90e1a61d94a5f66c0b3ce39b7b279  kdebase-workspace-4.2.4.tar.bz2


--- kdebase-workspace-4.1.80-session-button.patch DELETED ---


--- kdebase-workspace-4.2.4-krunner-tab.patch DELETED ---