rpms/kdebase-workspace/F-10 kdebase-workspace.spec, 1.161, 1.162 sources, 1.26, 1.27 kdebase-workspace-4.2.0-kde#177123.patch, 1.1, NONE kdebase-workspace-4.2.0-kde#181199.patch, 1.1, NONE kdebase-workspace-4.2.0-kdm-qt45.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8671/F-10

Modified Files:
	kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.2.0-kde#177123.patch 
	kdebase-workspace-4.2.0-kde#181199.patch 
	kdebase-workspace-4.2.0-kdm-qt45.patch 
Log Message:
KDE 4.2.1 (sync patches with devel)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kdebase-workspace.spec	27 Feb 2009 11:26:18 -0000	1.161
+++ kdebase-workspace.spec	27 Feb 2009 16:14:33 -0000	1.162
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.0
+Version: 4.2.1
 
-Release: 15%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -40,20 +40,12 @@
 # revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
 # 0.3 requires BlueZ 4 and the patch above
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
-# http://bugs.kde.org/180576
+# from 4.3: http://bugs.kde.org/180576
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-Patch104: kdebase-workspace-4.2.0-kdm-qt45.patch
-# http://bugs.kde.org/show_bug.cgi?id=181199
-# http://websvn.kde.org/?view=rev&revision=915366
-# fix shutdown dialog not centered, sometimes entirely off screen (from 4.2.1)
-Patch105: kdebase-workspace-4.2.0-kde#181199.patch
-# http://bugs.kde.org.177123  dpms issues
-Patch106: kdebase-workspace-4.2.0-kde#177123.patch
-
-# FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
+Provides: service(graphical-login) = kdm
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -100,7 +92,7 @@
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
-Requires: oxygen-icon-theme
+Requires: oxygen-icon-theme >= %{version}
 
 # split ksysguardd
 Requires: ksysguardd = %{version}-%{release}
@@ -230,10 +222,6 @@
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
 %patch103 -p1 -b .kde#180576
-%patch104 -p1 -b .kdm-qt45
-%patch105 -p0 -b .kde#181199
-%patch106 -p5 -b .kde#177123
-
 
 %build
 
@@ -245,8 +233,8 @@
   -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} \
-  -k || make -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}
+#  -k || make -C %{_target_platform}
 
 
 %install
@@ -382,12 +370,21 @@
 
 
 %changelog
-* Fri Feb 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-15
+* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Thu Feb 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-17
 - kio_sysinfo kick-off integration
 
-* Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-14
+* Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-16
 - no klipper action on selection for Arora browser
 
+* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-15
+- Provides: service(graphical-login) = kdm
+
+* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-14
+- Requires: oxygen-icon-theme >= %%version
+
 * Thu Feb 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-13
 - dpms issues (kdebug#177123)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	24 Jan 2009 06:17:59 -0000	1.26
+++ sources	27 Feb 2009 16:14:33 -0000	1.27
@@ -1 +1 @@
-193e30b9ed0b55b0196289d9df43a904  kdebase-workspace-4.2.0.tar.bz2
+629463e9dcf55ea53225ae252c72783d  kdebase-workspace-4.2.1.tar.bz2


--- kdebase-workspace-4.2.0-kde#177123.patch DELETED ---


--- kdebase-workspace-4.2.0-kde#181199.patch DELETED ---


--- kdebase-workspace-4.2.0-kdm-qt45.patch DELETED ---