rpms/kdebase-workspace/devel kdebase-workspace-4.3.4-kdm_plymouth.patch, 1.2, 1.3 kdebase-workspace.spec, 1.349, 1.350

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebase-workspace-4.3.4-kdm_plymouth.patch 
	kdebase-workspace.spec 
Log Message:
* Wed Jan 20 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.90-9
- fix infinite recursion in the patch for #556643

kdebase-workspace-4.3.4-kdm_plymouth.patch:
 dm.c |   36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

Index: kdebase-workspace-4.3.4-kdm_plymouth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.3.4-kdm_plymouth.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebase-workspace-4.3.4-kdm_plymouth.patch	19 Jan 2010 14:01:55 -0000	1.2
+++ kdebase-workspace-4.3.4-kdm_plymouth.patch	20 Jan 2010 01:57:31 -0000	1.3
@@ -29,7 +29,7 @@ diff -up kdebase-workspace-4.3.4/kdm/bac
 +{
 +	int should_force_display_on_active_vt;
 +	should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
-+        if ( triggered_to_force_display_on_active_vt() >= 0 )
++        if ( should_force_display_on_active_vt >= 0 )
 +                close(should_force_display_on_active_vt);
 +	unlink("/var/spool/gdm/force-display-on-active-vt");
 +	return should_force_display_on_active_vt;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -p -r1.349 -r1.350
--- kdebase-workspace.spec	19 Jan 2010 13:48:04 -0000	1.349
+++ kdebase-workspace.spec	20 Jan 2010 01:57:31 -0000	1.350
@@ -20,7 +20,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.3.90
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -662,18 +662,21 @@ fi
 
 
 %changelog
-* Tue Jan 19 2010 Rex Dieter <rdieter at fedoraproject.org> 4.3.90-8
-- SELinux is preventing /sbin/setfiles "read" access on 
- /var/spool/gdm/force-display-on-active-vt (deleted) (#556643) 
+* Wed Jan 20 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.90-9
+- fix infinite recursion in the patch for #556643
 
-* Sun Jan 17 2010 Rex Dieter <rdieter at fedoraproject.org> 4.3.90-7
+* Tue Jan 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-8
+- SELinux is preventing /sbin/setfiles "read" access on
+  /var/spool/gdm/force-display-on-active-vt (deleted) (#556643)
+
+* Sun Jan 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-7
 - rebuild (libxklavier)
 
 * Thu Jan 14 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.90-6
 - fix KDM's missing header build problem
 - polkit-qt BR for polkit-1
 
-* Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> 4.3.90-5
+* Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-5
 - do not link calendar dataengine with Akonadi (kde#215150, rh#552473)
 - s/plasma-engine/plasma-dataengine/