[cinnamon/f17] update to 1.6.7 release

leigh123linux leigh123linux at fedoraproject.org
Wed Nov 14 21:55:59 UTC 2012


commit a80f67d12e19f0ead58f80becc44875aaf3012eb
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 14 21:55:44 2012 +0000

    update to 1.6.7 release

 cinnamon-1.5.0_datetime_setting.patch |    2 +-
 cinnamon.spec                         |   13 ++++++++-----
 sources                               |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/cinnamon-1.5.0_datetime_setting.patch b/cinnamon-1.5.0_datetime_setting.patch
index 9ac6765..1748f9a 100644
--- a/cinnamon-1.5.0_datetime_setting.patch
+++ b/cinnamon-1.5.0_datetime_setting.patch
@@ -7,7 +7,7 @@
 -            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');
++            let item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
              if (item) {
                  let separator = new PopupMenu.PopupSeparatorMenuItem();
                  separator.setColumnWidths(1);
diff --git a/cinnamon.spec b/cinnamon.spec
index d228728..61c8709 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -7,8 +7,8 @@
 }
 
 Name:           cinnamon
-Version:        1.6.4
-Release:        2%{?dist}
+Version:        1.6.7
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -32,7 +32,6 @@ Patch2:         cinnamon-1.4.1_f17_favourite-apps-firefox.patch
 Patch3:         fedora_icon.patch
 Patch4:         nemo.patch
 Patch5:         cinnamon.css.patch
-Patch6:         cinnamon_menu_applet.patch
 
 # upstream patches and pending pulls
 
@@ -131,7 +130,6 @@ The emphasis is put on making users feel at home and providing
 %patch4 -p1
 
 %patch5 -p1
-%patch6 -p1
 
 # upstream patches and pending pulls
 
@@ -217,7 +215,7 @@ fi
 %{_datadir}/applications/cinnamon2d.desktop
 %{_datadir}/applications/cinnamon-settings.desktop
 %{_datadir}/applications/cinnamon-add-panel-launcher.desktop
-%{_datadir}/applications/cinnamon-settings.desktop
+%{_datadir}/applications/cinnamon-menu-editor.desktop
 %{_datadir}/xsessions/cinnamon*.desktop
 %{_datadir}/gnome-session/sessions/cinnamon*.session
 %{_datadir}/cinnamon/
@@ -231,6 +229,11 @@ fi
 
 
 %changelog
+* Wed Nov 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.7-1
+- update to 1.6.7 release
+- fix error in datetime patch
+- drop requires libgnomekbd (rhbz 874218)
+
 * Wed Nov 07 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.4-2
 - add requires gnome-panel (rhbz 872694)
 - add requires libgnomekbd (rhbz 874218)
diff --git a/sources b/sources
index 1d48ef3..5354a76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d760bf7fdde6ffa85119349cdbf3655  cinnamon-1.6.4.tar.gz
+ea73c6367d43d82c61f977477bf0c08c  cinnamon-1.6.7.tar.gz


More information about the scm-commits mailing list