rpms/kdelibs4/F-8 kdelibs-4.1.0-kde#167826.patch, 1.1, 1.2 kdelibs4.spec, 1.25, 1.26

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7580

Modified Files:
	kdelibs-4.1.0-kde#167826.patch kdelibs4.spec 
Log Message:
respin kde#167826 patch


kdelibs-4.1.0-kde#167826.patch:

Index: kdelibs-4.1.0-kde#167826.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs-4.1.0-kde#167826.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.0-kde#167826.patch	1 Aug 2008 13:10:54 -0000	1.1
+++ kdelibs-4.1.0-kde#167826.patch	1 Aug 2008 14:07:45 -0000	1.2
@@ -1,6 +1,7 @@
---- branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.cpp	2008/08/01 00:12:03	840376
-+++ branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.cpp	2008/08/01 00:14:54	840377
-@@ -251,11 +251,14 @@
+diff -up kdelibs-4.1.0/kdecore/kernel/kglobal.cpp.kde#167826 kdelibs-4.1.0/kdecore/kernel/kglobal.cpp
+--- kdelibs-4.1.0/kdecore/kernel/kglobal.cpp.kde#167826	2008-05-21 06:08:57.000000000 -0500
++++ kdelibs-4.1.0/kdecore/kernel/kglobal.cpp	2008-08-01 08:15:52.000000000 -0500
+@@ -251,11 +251,14 @@ QString KGlobal::caption()
  
  /**
   * This counter indicates when to quit the application.
@@ -19,7 +20,7 @@
  
  void KGlobal::ref()
  {
-@@ -267,9 +270,14 @@
+@@ -267,9 +270,14 @@ void KGlobal::deref()
  {
      --s_refCount;
      //kDebug() << "KGlobal::deref() : refCount = " << s_refCount;
@@ -35,9 +36,27 @@
 +}
 +
  #undef PRIVATE_DATA
---- branches/KDE/4.1/kdelibs/kdeui/widgets/kmainwindow.cpp	2008/08/01 00:12:03	840376
-+++ branches/KDE/4.1/kdelibs/kdeui/widgets/kmainwindow.cpp	2008/08/01 00:14:54	840377
-@@ -226,6 +226,11 @@
+diff -up kdelibs-4.1.0/kdecore/kernel/kglobal.h.kde#167826 kdelibs-4.1.0/kdecore/kernel/kglobal.h
+--- kdelibs-4.1.0/kdecore/kernel/kglobal.h.kde#167826	2008-05-21 06:08:57.000000000 -0500
++++ kdelibs-4.1.0/kdecore/kernel/kglobal.h	2008-08-01 08:21:49.000000000 -0500
+@@ -421,6 +421,13 @@ namespace KGlobal
+     KDECORE_EXPORT void deref();
+ 
+     /**
++     * If refcounting reaches 0 (or less), and @p allowQuit is true, the instance of the application
++     * will automatically be exited. Otherwise, the application will not exit automatically.
++     * @since 4.2
++     */
++    KDECORE_EXPORT void setAllowQuit(bool allowQuit);
++
++    /**
+      * The component currently active (useful in a multi-component
+      * application, such as a KParts application).
+      * Don't use this - it's mainly for KAboutDialog and KBugReport.
+diff -up kdelibs-4.1.0/kdeui/widgets/kmainwindow.cpp.kde#167826 kdelibs-4.1.0/kdeui/widgets/kmainwindow.cpp
+--- kdelibs-4.1.0/kdeui/widgets/kmainwindow.cpp.kde#167826	2008-07-23 03:26:33.000000000 -0500
++++ kdelibs-4.1.0/kdeui/widgets/kmainwindow.cpp	2008-08-01 08:15:52.000000000 -0500
+@@ -226,6 +226,11 @@ void KMainWindowPrivate::init(KMainWindo
  {
      KGlobal::ref();
  


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kdelibs4.spec	1 Aug 2008 13:10:54 -0000	1.25
+++ kdelibs4.spec	1 Aug 2008 14:07:45 -0000	1.26
@@ -210,7 +210,7 @@
 %patch19 -p0 -b .kinit-regression
 
 ## upstream patches
-%patch100 -p4 -b .kde#167826
+%patch100 -p1 -b .kde#167826
 
 
 %build