From af25633bc7e58c06eccb4b9cb3f439a81fad844e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Nov 11 2014 18:38:19 +0000
Subject: pull in upstream fix "Unbreak session management" for konqueror


---

diff --git a/Unbreak_session_management.patch b/Unbreak_session_management.patch
new file mode 100644
index 0000000..80fec1b
--- /dev/null
+++ b/Unbreak_session_management.patch
@@ -0,0 +1,25 @@
+commit dcc45ea70b0b408c8017c6f423b978fe6ca6163a
+Author: David Faure <faure@kde.org>
+Date:   Tue Nov 11 12:17:10 2014 +0100
+
+    Unbreak session management: don't clear this window (for reusing) while saving.
+    
+    BUG: 339699
+    FIXED-IN: 4.14.4
+    
+    (maybe this can be added to 4.14.3?)
+    CCMAIL: release-team@kde.org
+
+diff --git a/konqueror/src/konqmainwindow.cpp b/konqueror/src/konqmainwindow.cpp
+index 8f274c3..f19cddb 100644
+--- a/konqueror/src/konqmainwindow.cpp
++++ b/konqueror/src/konqmainwindow.cpp
+@@ -5190,7 +5190,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e )
+           QApplication::sendEvent( (*it)->part()->widget(), e );
+   }
+   KParts::MainWindow::closeEvent( e );
+-  if (stayPreloaded() && !kapp->sessionSaving()) {
++  if (!kapp->sessionSaving() && stayPreloaded()) {
+       e->ignore();
+       hide();
+   }
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index 6ac70cf..44950de 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -5,7 +5,7 @@
 Name:    kde-baseapps
 Summary: KDE Core Applications 
 Version: 4.14.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2 and GFDL
 URL:     https://projects.kde.org/projects/kde/kde-baseapps 
@@ -32,6 +32,7 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 Patch5: kde-baseapps-4.9.2-konqueror-mimetyp.patch
 
 ## upstream patches
+Patch100: Unbreak_session_management.patch
 
 # optional runtime dep for kcm_useraccount, see https://git.reviewboard.kde.org/r/110875/
 %if 0%{?fedora} || 0%{?rhel} > 6
@@ -238,6 +239,7 @@ Requires: libkonq%{?_isa} = %{version}-%{release}
 %patch2 -p2 -b .home-icon
 %patch3 -p2 -b .kde#228593
 %patch5 -p1 -b .mimetyp.patch
+%patch100 -p1 -b .100
 
 
 %build
@@ -580,6 +582,9 @@ fi
 
 
 %changelog
+* Tue Nov 11 2014 Rex Dieter <rdieter@fedoraproject.org> 4.14.3-2
+- pull in upstream fix "Unbreak session management" for konqueror
+
 * Sat Nov 08 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.3-1
 - 4.14.3