rpms/kdebase-workspace/F-12 kdebase-workspace-4.3.4-kdm_plymouth.patch, 1.2, 1.3 kdebase-workspace.spec, 1.317, 1.318

[Kevin Kofler]

Author: kkofler

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

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.4-6
- 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/F-12/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:02:12 -0000	1.2
+++ kdebase-workspace-4.3.4-kdm_plymouth.patch	20 Jan 2010 01:57:54 -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/F-12/kdebase-workspace.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- kdebase-workspace.spec	19 Jan 2010 13:47:15 -0000	1.317
+++ kdebase-workspace.spec	20 Jan 2010 01:57:54 -0000	1.318
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -617,15 +617,18 @@ fi
 
 
 %changelog
-* Tue Jan 19 2010 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-5
+* Wed Jan 20 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.4-6
+- fix infinite recursion in the patch for #556643
+
+* Tue Jan 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-5
 - SELinux is preventing /sbin/setfiles "read" access on
- /var/spool/gdm/force-display-on-active-vt (deleted) (#556643)
+  /var/spool/gdm/force-display-on-active-vt (deleted) (#556643)
 
-* Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> 4.3.4-4
+* Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.4-4
 - do not link calendar data engine with Akonadi, move to main package (#552473)
 - s/plasma-engine/plasma-dataengine/
 
-* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-3
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-3
 - hal-0.5.14-1 and failures with brightness controls (#545258)
 
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 4.3.4-2
@@ -635,10 +638,10 @@ fi
 - 4.3.4
 - kdm_plymouth patch (#475890)
 
-* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
+* 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
+* Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-7
 - kubuntu_101_brightness_fn_keys_and_osd.diff (#475247)
 
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-6