From 57dd047155eb02d9a662536475fc41a5ba1a3737 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Oct 21 2015 01:00:47 +0000
Subject: update to 1.11.0 release


---

diff --git a/.gitignore b/.gitignore
index 85281aa..90b79b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /caja-1.10.2.tar.xz
 /caja-1.10.3.tar.xz
 /caja-1.10.4.tar.xz
+/caja-1.11.0.tar.xz
diff --git a/caja.spec b/caja.spec
index b4ed379..dead8b8 100644
--- a/caja.spec
+++ b/caja.spec
@@ -2,7 +2,7 @@
 %global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
-%global branch 1.10
+%global branch 1.11
 
 # Settings used for build from snapshots.
 %{!?rel_build:%global commit ee0a62c8759040d84055425954de1f860bac8652}
@@ -14,7 +14,7 @@
 
 Name:        caja
 Summary:     File manager for MATE
-Version:     %{branch}.4
+Version:     %{branch}.0
 %if 0%{?rel_build}
 Release:     1%{?dist}
 %else
@@ -30,9 +30,6 @@ URL:         http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
-# http://git.mate-desktop.org/caja/commit/?id=d2dd87a
-Patch0:         caja_do-not-save-position-from-last-window.patch
-
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  exempi-devel
@@ -106,8 +103,6 @@ for developing caja extensions.
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
-%patch0 -p1 -b .position
-
 %if 0%{?rel_build}
 #NOCONFIGURE=1 ./autogen.sh
 %else # 0%{?rel_build}
@@ -229,6 +224,9 @@ fi
 
 
 %changelog
+* Wed Oct 21 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.11.0-1
+- update to 1.11.0 release
+
 * Fri Sep 25 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.4-1
 - update to 1.10.4 release
 - remove upstreamed patches
diff --git a/caja_do-not-save-position-from-last-window.patch b/caja_do-not-save-position-from-last-window.patch
deleted file mode 100644
index 4c3a9f7..0000000
--- a/caja_do-not-save-position-from-last-window.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d2dd87abc30e850bc18cd15b854e0246a22db880 Mon Sep 17 00:00:00 2001
-From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
-Date: Thu, 10 Sep 2015 13:25:34 +0000
-Subject: When opening the first window, don't restore the position of the last closed window. It's confusing to users (the last closed window is irrelevant within one session with multiple windows open) and it can lead to really bad issues which users consider bugs (why is my first window behaving differently than other windows? why is my first window appearing in the corner of my screen? why when I open caja for the first time my window doesn't appear on the monitor my mouse presently is? etc..)
-
----
-diff --git a/src/caja-application.c b/src/caja-application.c
-index 557ae7e..28c1ce1 100644
---- a/src/caja-application.c
-+++ b/src/caja-application.c
-@@ -1563,24 +1563,6 @@ caja_application_get_spatial_window (CajaApplication *application,
-     return window;
- }
- 
--static gboolean
--another_navigation_window_already_showing (CajaWindow *the_window)
--{
--    GList *list, *item;
--
--    list = caja_application_get_window_list ();
--    for (item = list; item != NULL; item = item->next)
--    {
--        if (item->data != the_window &&
--                CAJA_IS_NAVIGATION_WINDOW (item->data))
--        {
--            return TRUE;
--        }
--    }
--
--    return FALSE;
--}
--
- CajaWindow *
- caja_application_create_navigation_window (CajaApplication *application,
-         const char          *startup_id,
-@@ -1610,16 +1592,12 @@ caja_application_create_navigation_window (CajaApplication *application,
-     if (geometry_string != NULL &&
-             geometry_string[0] != 0)
-     {
--        /* Ignore saved window position if a window with the same
--         * location is already showing. That way the two windows
--         * wont appear at the exact same location on the screen.
--         */
-         eel_gtk_window_set_initial_geometry_from_string
-         (GTK_WINDOW (window),
-          geometry_string,
-          CAJA_NAVIGATION_WINDOW_MIN_WIDTH,
-          CAJA_NAVIGATION_WINDOW_MIN_HEIGHT,
--         another_navigation_window_already_showing (window));
-+         TRUE);
-     }
-     g_free (geometry_string);
- 
---
-cgit 
-
diff --git a/sources b/sources
index cb5c258..bc026c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2315ca3494b097bb161fbdde1168e36  caja-1.10.4.tar.xz
+f17092dd38edb62391970b5965cbc376  caja-1.11.0.tar.xz