From 820bef55da3c407614f770e2cc567704abf94f3a Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Jul 26 2013 15:55:47 +0000
Subject: Merge branch 'master' into f17


---

diff --git a/mate-session-manager-1.5.0-fix_schema.patch b/mate-session-manager-1.5.0-fix_schema.patch
deleted file mode 100644
index 9c43848..0000000
--- a/mate-session-manager-1.5.0-fix_schema.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 09388d8e945ef0674bca82c5ba375d901b14e693 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano@karapetsas.com>
-Date: Mon, 26 Nov 2012 21:23:39 +0100
-Subject: [PATCH] fix screensaver gschema usage close
- https://github.com/mate-desktop/mate-desktop/issues/38
-
----
- mate-session/gsm-manager.c | 30 ++++++++++++++++++++++++++++--
- 1 file changed, 28 insertions(+), 2 deletions(-)
-
-diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
-index 8b2e024..ad4ed89 100644
---- a/mate-session/gsm-manager.c
-+++ b/mate-session/gsm-manager.c
-@@ -137,6 +137,7 @@ struct GsmManagerPrivate
- 
-         GSettings              *settings_session;
-         GSettings              *settings_lockdown;
-+        GSettings              *settings_screensaver;
- 
-         DBusGProxy             *bus_proxy;
-         DBusGConnection        *connection;
-@@ -967,8 +968,11 @@ manager_switch_user (GsmManager *manager)
- static gboolean
- sleep_lock_is_enabled (GsmManager *manager)
- {
--        return g_settings_get_boolean (manager->priv->settings_lockdown,
--                                       KEY_SLEEP_LOCK);
-+        if (manager->priv->settings_screensaver != NULL)
-+                return g_settings_get_boolean (manager->priv->settings_screensaver,
-+                                               KEY_SLEEP_LOCK);
-+        else
-+                return FALSE;
- }
- 
- static void
-@@ -2178,6 +2182,11 @@ gsm_manager_dispose (GObject *object)
-                 manager->priv->settings_lockdown = NULL;
-         }
- 
-+        if (manager->priv->settings_screensaver) {
-+                g_object_unref (manager->priv->settings_screensaver);
-+                manager->priv->settings_screensaver = NULL;
-+        }
-+
-         if (manager->priv->up_client != NULL) {
-                 g_object_unref (manager->priv->up_client);
-                 manager->priv->up_client = NULL;
-@@ -2336,12 +2345,29 @@ on_presence_status_changed (GsmPresence  *presence,
- static void
- gsm_manager_init (GsmManager *manager)
- {
-+        const char * const *schemas;
-+        gboolean schema_exists;
-+        guint i;
- 
-         manager->priv = GSM_MANAGER_GET_PRIVATE (manager);
- 
-         manager->priv->settings_session = g_settings_new (SESSION_SCHEMA);
-         manager->priv->settings_lockdown = g_settings_new (LOCKDOWN_SCHEMA);
- 
-+        /* check if mate-screensaver is installed */
-+        schemas = g_settings_list_schemas ();
-+        schema_exists = FALSE;
-+        for (i = 0; schemas[i] != NULL; i++) {
-+                if (g_str_equal (schemas[i], SCREENSAVER_SCHEMA)) {
-+                        schema_exists = TRUE;
-+                        break;
-+                }
-+        }
-+        if (schema_exists == TRUE)
-+                manager->priv->settings_screensaver = g_settings_new (SCREENSAVER_SCHEMA);
-+        else
-+                manager->priv->settings_screensaver = NULL;
-+
-         manager->priv->inhibitors = gsm_store_new ();
-         g_signal_connect (manager->priv->inhibitors,
-                           "added",
--- 
-1.8.0
diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 7ba2a7a..84e430e 100644
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -1,17 +1,16 @@
 Name:           mate-session-manager
 Version:        1.6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MATE Desktop session manager
 License:        GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 #Patch from upstream to fix race condition that launches multiple caja windows on first login
-Patch0:         x-caja.patch
+#Patch0:         x-caja.patch
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  gsettings-desktop-schemas-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  icon-naming-utils
 BuildRequires:  libSM-devel
@@ -19,7 +18,6 @@ BuildRequires:  mate-common
 BuildRequires:  mate-icon-theme
 BuildRequires:  mate-polkit-devel
 BuildRequires:  pango-devel
-BuildRequires:  pango-devel 
 BuildRequires:  polkit-devel
 BuildRequires:  upower-devel
 BuildRequires:  systemd-devel
@@ -32,7 +30,7 @@ full-featured user session.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
  
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -40,7 +38,6 @@ NOCONFIGURE=1 ./autogen.sh
            --enable-ipv6 \
            --with-gtk=2.0 \
            --with-default-wm=marco \
-           --enable-docbook-docs \
            --with-systemd \
            --with-x
 
@@ -87,6 +84,12 @@ fi
 %{_datadir}/MateConf/gsettings/mate-session.convert
 
 %changelog
+* Mon Jun 17 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-4
+- Drop the caja patch
+- Build against latest systemd
+- Disable building docbook docs
+- Clean up BRs
+
 * Thu May 23 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-3
 - Add patch for caja race condition