[cinnamon/f17] update to 1.6.1 release
leigh123linux
leigh123linux at fedoraproject.org
Fri Sep 28 21:28:00 UTC 2012
commit 4adf22eb26df5b7f798862d00c2f93a1a1a1a07f
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Fri Sep 28 22:27:57 2012 +0100
update to 1.6.1 release
cinnamon-1.5.0_datetime_setting.patch | 10 +++++-----
cinnamon.spec | 9 ++++++---
sources | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/cinnamon-1.5.0_datetime_setting.patch b/cinnamon-1.5.0_datetime_setting.patch
index dab9b02..9ac6765 100644
--- a/cinnamon-1.5.0_datetime_setting.patch
+++ b/cinnamon-1.5.0_datetime_setting.patch
@@ -11,15 +11,15 @@
if (item) {
let separator = new PopupMenu.PopupSeparatorMenuItem();
separator.setColumnWidths(1);
-@@ -96,11 +94,6 @@ MyApplet.prototype = {
- on_applet_clicked: function(event) {
+@@ -105,11 +103,6 @@ MyApplet.prototype = {
this.menu.toggle();
},
--
+
- _onLaunchSettings: function() {
- this.menu.close();
- Util.spawnCommandLine("cinnamon-settings calendar");
- },
-
+-
_updateClockAndDate: function() {
- let dateFormat = this._calendarSettings.get_string('date-format');
+ let displayDate = new Date();
+ let dateFormattedFull = displayDate.toLocaleFormat(this._dateFormatFull);
diff --git a/cinnamon.spec b/cinnamon.spec
index 8f4487b..4c9f66a 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global _internal_version bd02368
+%global _internal_version 1359845
%{?filter_setup:
%filter_from_provides /^libcinnamon.so/d;
@@ -7,7 +7,7 @@
}
Name: cinnamon
-Version: 1.6.0
+Version: 1.6.1
Release: 1%{?dist}
Summary: Window management and application launching for GNOME
@@ -156,7 +156,7 @@ rm -rf debian/
export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
NOCONFIGURE=1 ./autogen.sh
%configure --disable-static
-make V=1 %{?_smp_mflags}
+make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
@@ -219,6 +219,9 @@ fi
%changelog
+* Thu Sep 27 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-1
+- update to 1.6.1 release
+
* Tue Sep 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.0-1
- update to 1.6.0 release
- drop upstream patches
diff --git a/sources b/sources
index 7ea6b45..1bcaa49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-236c4007c0b27286b966ba0d8d768f1a cinnamon-1.6.0.tar.gz
+702c66bc6ea846058a671f07fff6f94d cinnamon-1.6.1.tar.gz
More information about the scm-commits
mailing list