rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.132, 1.133 kdebase-workspace-4.1.65-consolekit-kdm.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23447

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.1.65-consolekit-kdm.patch 
Log Message:
- drop kdebase-workspace-4.1.65-consolekit-kdm.patch



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kdebase-workspace.spec	19 Nov 2008 23:06:47 -0000	1.132
+++ kdebase-workspace.spec	19 Nov 2008 23:14:36 -0000	1.133
@@ -10,18 +10,17 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdebase-workspace-4.1.72-redhat-startkde.patch
-Patch2: kdebase-workspace-4.1.65-consolekit-kdm.patch
-Patch3: kdebase-workspace-4.1.72-plasma-konsole.patch
-Patch4: kdebase-workspace-4.1.1-show-systemsettings.patch
-Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch
+Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
+Patch3: kdebase-workspace-4.1.1-show-systemsettings.patch
+Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
 #Â 434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch6: kdebase-workspace-4.1.2-rootprivs.patch
-Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch
+Patch5: kdebase-workspace-4.1.2-rootprivs.patch
+Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
 #Â 441062: packagekit tools do not show icons correctly on KDE
-Patch8: kdebase-workspace-4.0.3-krdb.patch
-Patch9: kdebase-workspace-4.0.72-klipper-url.patch
-Patch10: kdebase-workspace-4.1.80-session-button.patch
-Patch11: kdebase-workspace-4.1.2-ldap.patch
+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
+Patch10: kdebase-workspace-4.1.2-ldap.patch
 
 # upstream patches:
 
@@ -150,20 +149,18 @@
 
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
-# ConsoleKit support for KDM (#228111, #430388, kde#147790)
-%patch2 -p2 -b .consolekit
-%patch3 -p1 -b .plasma-konsole
-%patch4 -p1 -b .show-systemsettings
+%patch2 -p1 -b .plasma-konsole
+%patch3 -p1 -b .show-systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
-%patch5 -p1 -b .ck-shutdown
+%patch4 -p1 -b .ck-shutdown
 pushd systemsettings
-%patch6 -p0 -b .rootprivs
+%patch5 -p0 -b .rootprivs
 popd
-%patch7 -p0 -b .timedate-kcm
-%patch8 -p0 -b .krdb
-%patch9 -p1 -b .klipper-url
-%patch10 -p1 -b .session-button
-%patch11 -p1 -b .ldap
+%patch6 -p0 -b .timedate-kcm
+%patch7 -p0 -b .krdb
+%patch8 -p1 -b .klipper-url
+%patch9 -p1 -b .session-button
+%patch10 -p1 -b .ldap
 
 # upstream patches
 
@@ -312,6 +309,7 @@
 - merged
 - drop kdebase-workspace-4.1.2-kdm-i18n.patch, it's included in upstream
 - drop kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, it's included in upstream
+- drop kdebase-workspace-4.1.65-consolekit-kdm.patch
 - add kdebase-workspace-4.1.80-session-button.patch
 - add kdebase-workspace-4.1.2-ldap.patch
 


--- kdebase-workspace-4.1.65-consolekit-kdm.patch DELETED ---