diff --git a/.gitignore b/.gitignore index b95c96e..f4ee26b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /mate-session-manager-1.10.2.tar.xz /mate-session-manager-1.11.0.tar.xz /mate-session-manager-1.12.0.tar.xz +/mate-session-manager-1.12.1.tar.xz diff --git a/mate-session-manager.spec b/mate-session-manager.spec index 36126e1..8173cde 100644 --- a/mate-session-manager.spec +++ b/mate-session-manager.spec @@ -15,9 +15,9 @@ Name: mate-session-manager Summary: MATE Desktop session manager License: GPLv2+ -Version: %{branch}.0 +Version: %{branch}.1 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 1%{?dist} %else Release: 0.1%{?git_rel}%{?dist} %endif @@ -29,9 +29,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/mate-session-manager/commit/?id=c3dadac -Patch0: mate-session-manager_get-rid-of-dependency-on-libmate-desktop.patch - BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: gtk3-devel @@ -62,9 +59,6 @@ full-featured user session. %prep %setup -q%{!?rel_build:n %{name}-%{commit}} -%patch0 -p1 -b .dependency -NOCONFIGURE=1 ./autogen.sh - %if 0%{?rel_build} # for releases #NOCONFIGURE=1 ./autogen.sh @@ -135,6 +129,10 @@ fi %changelog +* Fri Dec 04 2015 Wolfgang Ulbrich 1.12.1-1 +- update to 1.12.1 release +- remove upstreamed patch + * Sat Nov 21 2015 Wolfgang Ulbrich - 1.12.0-2 - get rid of dependency to mate-desktop - build with gtk3 diff --git a/mate-session-manager_get-rid-of-dependency-on-libmate-desktop.patch b/mate-session-manager_get-rid-of-dependency-on-libmate-desktop.patch deleted file mode 100644 index 705ad01..0000000 --- a/mate-session-manager_get-rid-of-dependency-on-libmate-desktop.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 74d86ac..86150c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,6 @@ GLIB_REQUIRED=2.36.0 - GIO_REQUIRED=2.25.0 - DBUS_GLIB_REQUIRED=0.76 - UPOWER_REQUIRED=0.9.0 --MATE_DESKTOP_REQUIRED=1.9.3 - - case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 -@@ -76,7 +75,6 @@ PKG_CHECK_MODULES(MATE_SESSION, - gio-2.0 >= $GIO_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED - ) - - PKG_CHECK_MODULES(SESSION_PROPERTIES, -diff --git a/mate-session/main.c b/mate-session/main.c -index 5f6e221..967bb8a 100644 ---- a/mate-session/main.c -+++ b/mate-session/main.c -@@ -39,8 +39,6 @@ - #include - #include - --#include -- - #include "mdm-signal-handler.h" - #include "mdm-log.h" - -@@ -537,6 +535,22 @@ void debug_changed (GSettings *settings, gchar *key, gpointer user_data) - mdm_log_set_debug (debug); - } - -+static gboolean -+schema_exists (const gchar* schema_name) -+{ -+ GSettingsSchemaSource *source; -+ GSettingsSchema *schema; -+ gboolean exists; -+ -+ source = g_settings_schema_source_get_default(); -+ schema = g_settings_schema_source_lookup (source, schema_name, FALSE); -+ exists = (schema != NULL); -+ if (schema) -+ g_settings_schema_unref (schema); -+ -+ return exists; -+} -+ - static void set_overlay_scroll (void) - { - GSettings *settings; -@@ -608,7 +622,7 @@ int main(int argc, char** argv) - mdm_log_init(); - - /* Allows to enable/disable debug from GSettings only if it is not set from argument */ -- if (!debug && mate_gsettings_schema_exists(DEBUG_SCHEMA)) -+ if (!debug && schema_exists(DEBUG_SCHEMA)) - { - debug_settings = g_settings_new (DEBUG_SCHEMA); - g_signal_connect (debug_settings, "changed::" DEBUG_KEY, G_CALLBACK (debug_changed), NULL); - diff --git a/sources b/sources index 3ec0dcd..c8e3b8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7bb01b5f91a6b287fef8e77e94af3e7 mate-session-manager-1.12.0.tar.xz +dd14694806eca860d6f7fd25297af7dd mate-session-manager-1.12.1.tar.xz