From e5714d37471b904eece00fbd7d83031573072043 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Nov 10 2013 13:13:35 +0000 Subject: update to 2.0.11 --- diff --git a/.gitignore b/.gitignore index cddc140..7982a4f 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /Cinnamon-2.0.7.tar.gz /Cinnamon-2.0.8.tar.gz /Cinnamon-2.0.10.tar.gz +/Cinnamon-2.0.11.tar.gz diff --git a/cinnamon-fedora.gschema.override b/cinnamon-fedora.gschema.override index 40aec0f..2ab0e16 100644 --- a/cinnamon-fedora.gschema.override +++ b/cinnamon-fedora.gschema.override @@ -32,3 +32,10 @@ font-name='Cantarell 11' [org.cinnamon.desktop.wm.preferences] button-layout=':minimize,maximize,close' titlebar-font='Cantarell Bold 11' + +[org.cinnamon.settings-daemon.plugins.xsettings] +hinting="slight" +menus-have-icons=true + +[org.cinnamon.settings-daemon.plugins.power] +lock-on-suspend=true diff --git a/cinnamon.spec b/cinnamon.spec index fed1ca1..e05b1b4 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,8 +1,8 @@ #global _internal_version 8a53cfb Name: cinnamon -Version: 2.0.10 -Release: 2%{?dist} +Version: 2.0.11 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com @@ -24,14 +24,12 @@ Patch3: cinnamon-settings-apps.patch Patch4: keyboard_applet.patch Patch5: input_keybindings.patch Patch6: bluetooth.patch -# https://github.com/linuxmint/Cinnamon/commit/382518aeeeb833241cc31134c3c6a69da571faf8 -Patch7: draw_bg.patch %global clutter_version 1.12.2 %global cjs_version 1.9.1 -%global cinnamon_desktop_version 1.9.1 +%global cinnamon_desktop_version 2.0.2 %global gobject_introspection_version 1.34.2 -%global muffin_version 1.9.1 +%global muffin_version 2.0.11 %global json_glib_version 0.13.2 BuildRequires: pkgconfig(clutter-1.0) >= %{clutter_version} @@ -126,7 +124,6 @@ Obsoletes: cinnamon-settings Obsoletes: cinnamon-menu-editor Obsoletes: cinnamon <= 1.8.0-1 - %description Cinnamon is a Linux desktop which provides advanced innovative features and a traditional user experience. @@ -147,7 +144,6 @@ The emphasis is put on making users feel at home and providing %if 0%{?fedora} < 20 %patch6 -p1 %endif -%patch7 -p1 NOCONFIGURE=1 ./autogen.sh %build @@ -156,7 +152,7 @@ NOCONFIGURE=1 ./autogen.sh --disable-rpath \ --disable-schemas-compile \ --enable-introspection=yes \ - --enable-compile-warnings=no + --enable-compile-warnings=no make %{?_smp_mflags} V=1 @@ -232,6 +228,11 @@ fi %{_mandir}/man1/* %changelog +* Sun Nov 10 2013 Leigh Scott - 2.0.11-1 +- update to 2.0.11 +- remove upstream patch +- tweak gschema override + * Tue Nov 05 2013 Leigh Scott - 2.0.10-2 - add patch to draw desktop background immediately diff --git a/draw_bg.patch b/draw_bg.patch deleted file mode 100644 index 0413f28..0000000 --- a/draw_bg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/js/ui/backgroundManager.js b/js/ui/backgroundManager.js -index 7a2ad86..6dd76ba 100644 ---- a/js/ui/backgroundManager.js -+++ b/js/ui/backgroundManager.js -@@ -34,6 +34,7 @@ BackgroundManager.prototype = { - this._cinnamonSettings.connect("changed", Lang.bind(this, this.on_settings_changed_event_cb)); - - this.bg.load_from_preferences(this._cinnamonSettings); -+ this.draw_background(); - }, - - draw_background: function() { diff --git a/sources b/sources index 9fc89a9..a52f9a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16c7c23c08ab52f6de1c4eedd03dbe2c Cinnamon-2.0.10.tar.gz +a28e9ede64e67c9f77ed3efec12b133b Cinnamon-2.0.11.tar.gz