rpms/kdebase-workspace/F-11 kdebase-workspace-4.3.3-kdm_plymouth.patch, NONE, 1.1 kdebase-workspace.spec, 1.248, 1.249

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
- force use of ServerVTs(1), if booting from plymouth (#475890)


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE kdebase-workspace-4.3.3-kdm_plymouth.patch ---
diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
--- kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth	2008-07-21 19:03:20.000000000 -0500
+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-01 12:26:16.435483131 -0600
@@ -1356,6 +1356,9 @@ allocateVT( struct display *d )
 						}
 					}
 				}
+				/* if using plymouth, force use of specified vt.  TODO: query/use activevt */
+				if ((open( "/var/spool/gdm/force-display-on-active-vt", O_RDONLY )) >= 0 )
+					volun = False;
 				if (!volun || !((1 << tvt) & getBusyVTs())) {
 					d->serverVT = tvt;
 					return;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- kdebase-workspace.spec	14 Nov 2009 18:40:36 -0000	1.248
+++ kdebase-workspace.spec	1 Dec 2009 19:43:15 -0000	1.249
@@ -8,7 +8,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -36,6 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
+Patch18: kdebase-workspace-4.3.3-kdm_plymouth.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -49,9 +50,9 @@ Patch51: http://bazaar.launchpad.net/~ku
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-%if 0%{?with_polkit_09}
 Requires: PolicyKit-authentication-agent
-%else
+
+%if ! 0%{?with_polkit_09}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
 # if/when we actually create this one:
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
@@ -275,6 +276,7 @@ Requires: akonadi
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
+%patch18 -p1 -b .kdm_plymouth
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -613,6 +615,12 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
+- force use of ServerVTs(1), if booting from plymouth (#475890)
+
+* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
+- Requires: PolicyKit-authentication-agent unconditionally (ie, in F-12 too)
+
 * Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7
 - kubuntu_101_brightness_fn_keys_and_osd.diff (#475247)