diff --git a/.gitignore b/.gitignore index d64c291..18f5a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /cinnamon-1.9.2.git2d1ac4d.tar.gz /cinnamon-1.9.2.git8a53cfb.tar.gz /cinnamon-1.9.2.tar.gz +/Cinnamon-2.0.2.tar.gz diff --git a/cinnamon.spec b/cinnamon.spec index 4f02932..798d610 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,8 +1,8 @@ -%global _internal_version 8a53cfb +#global _internal_version 8a53cfb Name: cinnamon -Version: 1.9.2 -Release: 4%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com @@ -11,7 +11,7 @@ URL: http://cinnamon.linuxmint.com # wget https://github.com/linuxmint/Cinnamon/archive/%%{version}.tar.gz -O cinnamon-%%{version}.tar.gz # for git # wget https://github.com/linuxmint/Cinnamon/tarball/%%{_internal_version} -O cinnamon-%%{version}.git%%{_internal_version}.tar.gz -Source0: http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}-%{version}.tar.gz +Source0: http://leigh123linux.fedorapeople.org/pub/%{name}/source/Cinnamon-%{version}.tar.gz Source1: cinnamon-fedora.gschema.override Patch0: background.patch @@ -21,10 +21,9 @@ Patch3: cinnamon-settings-apps.patch Patch4: keyboard_applet.patch Patch5: input_keybindings.patch Patch6: bluetooth.patch -Patch7: git_rollup.patch %global clutter_version 1.12.2 -%global cjs_version 1:1.9.1 +%global cjs_version 1.9.1 %global cinnamon_desktop_version 1.9.1 %global gobject_introspection_version 1.34.2 %global muffin_version 1.9.1 @@ -64,7 +63,7 @@ BuildRequires: pkgconfig(gtk-doc) BuildRequires: gnome-common # mediia keys BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(xproto +BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(colord) %ifnarch s390 s390x %{?rhel:ppc ppc64} @@ -144,8 +143,6 @@ The emphasis is put on making users feel at home and providing %if 0%{?fedora} < 20 %patch6 -p1 %endif -%patch7 -p1 -rm -rf config/ NOCONFIGURE=1 ./autogen.sh %build @@ -217,6 +214,10 @@ fi %{_mandir}/man1/* %changelog +* Wed Oct 09 2013 Leigh Scott - 2.0.2-1 +- update to 2.0.2 +- drop upstream patch + * Mon Oct 07 2013 Leigh Scott - 1.9.2-4 - revert ST changes diff --git a/git_rollup.patch b/git_rollup.patch deleted file mode 100644 index eafd841..0000000 --- a/git_rollup.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 2d807f5..46353a2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,7 +62,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder) - - CLUTTER_MIN_VERSION=1.7.5 - GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1 --GJS_MIN_VERSION=1.29.18 -+GJS_MIN_VERSION=1.9.0 - MUFFIN_MIN_VERSION=1.0.5 - GTK_MIN_VERSION=3.0.0 - GIO_MIN_VERSION=2.29.10 -diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -index e80d97b..73fb87c 100644 ---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -@@ -108,8 +108,8 @@ let compatible_players = [ - 'deadbeef', 'smplayer', 'tomahawk']; - let support_seek = [ - 'clementine', 'banshee', 'rhythmbox', 'rhythmbox3', 'pragha', 'quodlibet', -- 'amarok', 'noise', 'xnoise', 'gmusicbrowser', 'spotify', 'vlc', 'beatbox', -- 'gnome-mplayer', 'qmmp', 'deadbeef', 'tomahawk']; -+ 'amarok', 'xnoise', 'gmusicbrowser', 'spotify', 'vlc', 'beatbox', -+ 'gnome-mplayer', 'qmmp', 'deadbeef']; - /* dummy vars for translation */ - let x = _("Playing"); - x = _("Paused"); -diff --git a/files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js -index c2a4c61..0bdd671 100644 ---- a/files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js -@@ -94,7 +94,20 @@ MyApplet.prototype = { - } - })); - -- if (GLib.file_test("/usr/bin/mdmflexiserver", GLib.FileTest.EXISTS)) { -+ if (GLib.getenv("XDG_SEAT_PATH")) { -+ // LightDM -+ this.menu.addAction(_("Switch User"), Lang.bind(this, function() { -+ Util.spawnCommandLine("cinnamon-screensaver-command --lock"); -+ Util.spawnCommandLine("dm-tool switch-to-greeter"); -+ })); -+ -+ this.menu.addAction(_("Guest Session"), Lang.bind(this, function() { -+ Util.spawnCommandLine("cinnamon-screensaver-command --lock"); -+ Util.spawnCommandLine("dm-tool switch-to-guest"); -+ })); -+ } -+ else if (GLib.file_test("/usr/bin/mdmflexiserver", GLib.FileTest.EXISTS)) { -+ // MDM - this.menu.addAction(_("Switch User"), Lang.bind(this, function() { - Util.spawnCommandLine("mdmflexiserver"); - })); -diff --git a/js/ui/hotCorner.js b/js/ui/hotCorner.js -index 82dafab..af91dda 100644 ---- a/js/ui/hotCorner.js -+++ b/js/ui/hotCorner.js -@@ -230,17 +230,6 @@ HotCorner.prototype = { - this._animRipple(this._ripple3, 0.35, 1.0, 0.0, 0.3, 1); - }, - -- handleDragOver: function(source, actor, x, y, time) { -- if (source != Main.xdndHandler) -- return; -- -- if (!Main.overview.visible && !Main.overview.animationInProgress && !Main.expo.visible) { -- this.rippleAnimation(); -- Main.overview.showTemporarily(); -- Main.overview.beginItemDrag(actor); -- } -- }, -- - runAction: function(){ - this._activationTime = Date.now() / 1000; - diff --git a/sources b/sources index a6890d5..65d86f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1de43af3c3c995acff4dff61d21bb691 cinnamon-1.9.2.tar.gz +d01abf29a3e19bea9075cb4694398ad4 Cinnamon-2.0.2.tar.gz