[cinnamon/f17] Update to 1.5.1 release

[leigh123linux]

commit 9c2eb6ce579a6b7cc740d6768e4a769f8f698313
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Jul 26 13:34:32 2012 +0100

    Update to 1.5.1 release
    
    - Remove buildrequires telepathy-glib-devel, telepathy-logger-devel and folks-devel
    - Drop obsolete patches
    - Add buildrequires libsoup-devel libgnome-keyring-devel

 .gitignore                            |    1 +
 cinnamon-1.4.1_settings.patch         |  359 ---------------------------------
 cinnamon-1.5.0_datetime_setting.patch |   25 +++
 cinnamon.spec                         |   32 ++--
 sources                               |    2 +-
 5 files changed, 44 insertions(+), 375 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd557e9..e3d93fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cinnamon-1.4.1.git7959517.tar.gz
+/cinnamon-1.5.1.tar.gz
diff --git a/cinnamon-1.5.0_datetime_setting.patch b/cinnamon-1.5.0_datetime_setting.patch
new file mode 100644
index 0000000..dab9b02
--- /dev/null
+++ b/cinnamon-1.5.0_datetime_setting.patch
@@ -0,0 +1,25 @@
+--- a/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js	2012-03-12 14:31:34.000000000 +0000
++++ b/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js	2012-03-13 10:56:47.918048379 +0000
+@@ -62,9 +62,7 @@ MyApplet.prototype = {
+             this._calendar = new Calendar.Calendar(this._eventSource);       
+             vbox.add(this._calendar.actor);
+ 
+-            let item = new PopupMenu.PopupMenuItem(_("Date and Time Settings"))
+-            item.connect("activate", Lang.bind(this, this._onLaunchSettings));
+-            //this.menu.addMenuItem(item);
++            item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
+             if (item) {
+                 let separator = new PopupMenu.PopupSeparatorMenuItem();
+                 separator.setColumnWidths(1);
+@@ -96,11 +94,6 @@ MyApplet.prototype = {
+     on_applet_clicked: function(event) {
+         this.menu.toggle();
+     },
+-    
+-    _onLaunchSettings: function() {
+-        this.menu.close();
+-        Util.spawnCommandLine("cinnamon-settings calendar");
+-    },
+ 
+     _updateClockAndDate: function() {
+         let dateFormat = this._calendarSettings.get_string('date-format');       
diff --git a/cinnamon.spec b/cinnamon.spec
index 18fd6f7..f0cd0d3 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global        _internal_version  7959517
+%global        _internal_version  719889b
 
 %{?filter_setup:
 %filter_from_provides /^libcinnamon.so/d;
@@ -7,8 +7,8 @@
 }
 
 Name:           cinnamon
-Version:        1.4.1
-Release:        0.10.git%{_internal_version}%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -16,7 +16,7 @@ License:        GPLv2+
 URL:            http://cinnamon.linuxmint.com
 # To generate tarball
 # wget https://github.com/linuxmint/Cinnamon/tarball/%%{_internal_version} -O cinnamon-%%{version}.git%%{_internal_version}.tar.gz
-Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon/source/cinnamon-%{version}.git%{_internal_version}.tar.gz
+Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon/source/cinnamon-%{version}.tar.gz
 Source1:        cinnamon.desktop
 Source2:        cinnamon.session
 Source3:        cinnamon2d.desktop
@@ -26,9 +26,7 @@ Source5:        menu.png
 
 # Fix menu structure
 Patch0:         cinnamon-1.4.1_menu.patch
-# I have reported this issue
-# https://github.com/linuxmint/Cinnamon/issues/515
-Patch1:         cinnamon-1.4.1_settings.patch
+Patch1:         cinnamon-1.5.0_datetime_setting.patch
 # Replace mint favorites with fedora gnome-shell defaults
 Patch2:         cinnamon-1.4.1_f17_favourite-apps-firefox.patch
 
@@ -38,12 +36,11 @@ Patch2:         cinnamon-1.4.1_f17_favourite-apps-firefox.patch
 Patch10:         cinnamon-1.4.1_systray.patch
 # https://github.com/linuxmint/Cinnamon/pull/929
 Patch11:         cinnamon-menu.patch
-# https://github.com/linuxmint/Cinnamon/issues/944
-Patch12:         port-window-gsettings.patch
+
 
 %global clutter_version 1.7.5
 %global gobject_introspection_version 0.10.1
-%global muffin_version 1.0.4
+%global muffin_version 1.0.5
 %global eds_version 2.91.6
 %global json_glib_version 0.13.2
 
@@ -61,8 +58,6 @@ BuildRequires:  json-glib-devel >= %{json_glib_version}
 BuildRequires:  upower-devel
 BuildRequires:  NetworkManager-glib-devel
 BuildRequires:  polkit-devel
-BuildRequires:  telepathy-glib-devel
-BuildRequires:  telepathy-logger-devel >= 0.2.6
 BuildRequires:  libgudev1-devel
 # for screencast recorder functionality
 BuildRequires:  gstreamer-devel
@@ -70,7 +65,9 @@ BuildRequires:  gtk3-devel
 BuildRequires:  intltool
 BuildRequires:  libcanberra-devel
 BuildRequires:  libcroco-devel
-BuildRequires:  folks-devel
+BuildRequires:  libgnome-keyring-devel
+BuildRequires:  libsoup-devel
+
 
 # for barriers
 BuildRequires:  libXfixes-devel >= 5.0
@@ -120,12 +117,11 @@ The emphasis is put on making users feel at home and providing
 %prep
 %setup -q -n linuxmint-Cinnamon-%{_internal_version}
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
 # upstream patches and pending pulls
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 
 # remove gschema
@@ -233,6 +229,12 @@ fi
 
 
 %changelog
+* Thu Jul 26 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.1-1
+- Update to 1.5.1 release
+- Remove buildrequires telepathy-glib-devel, telepathy-logger-devel and folks-devel
+- Drop obsolete patches
+- Add buildrequires libsoup-devel libgnome-keyring-devel
+
 * Sat Jul 21 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.10.git7959517
 - Add requires accountsservice-libs
 
diff --git a/sources b/sources
index 3524bb5..dc832bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b6fecfc2ca44366222e54fb44269600  cinnamon-1.4.1.git7959517.tar.gz
+9b6111d402a6f0313676814da298a95d  cinnamon-1.5.1.tar.gz