[cinnamon] update to 1.5.2 release

leigh123linux leigh123linux at fedoraproject.org
Thu Jul 26 23:55:28 UTC 2012


commit 94caf9257f86bfe222cc3a9e0b0810990ed7482d
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 27 00:55:09 2012 +0100

    update to 1.5.2 release

 .gitignore                   |    1 +
 cinnamon-1.4.1_systray.patch |   22 -
 cinnamon-menu.patch          | 3410 ------------------------------------------
 cinnamon.spec                |   24 +-
 sources                      |    2 +-
 5 files changed, 12 insertions(+), 3447 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd2a0f8..6d2e21b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cinnamon-1.4.1.git7959517.tar.gz
 /cinnamon-1.5.0.git49593cb.tar.gz
+/cinnamon-1.5.2.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index aaf36ea..046c906 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global        _internal_version  49593cb
+%global        _internal_version  9e88200
 
 %{?filter_setup:
 %filter_from_provides /^libcinnamon.so/d;
@@ -7,8 +7,8 @@
 }
 
 Name:           cinnamon
-Version:        1.5.0
-Release:        0.1.git%{_internal_version}%{?dist}
+Version:        1.5.2
+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,23 +26,16 @@ 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.5.0_datetime_setting.patch
 # Replace mint favorites with fedora gnome-shell defaults
 Patch2:         cinnamon-1.4.1_f17_favourite-apps-firefox.patch
 
-
 # upstream patches and pending pulls
-# https://github.com/linuxmint/Cinnamon/pull/851
-Patch10:         cinnamon-1.4.1_systray.patch
-# https://github.com/linuxmint/Cinnamon/pull/929
-Patch11:         cinnamon-menu.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
 
@@ -121,9 +114,9 @@ The emphasis is put on making users feel at home and providing
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+
 # upstream patches and pending pulls
-%patch10 -p1
-%patch11 -p1
+
 
 
 # remove gschema
@@ -231,6 +224,9 @@ fi
 
 
 %changelog
+* Thu Jul 26 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-1
+- update to 1.5.2 release
+
 * Tue Jul 24 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-0.1.git49593cb
 - Update to the latest snapshot
 - Remove buildrequires telepathy-glib-devel, telepathy-logger-devel and folks-devel
diff --git a/sources b/sources
index 35a5294..e723498 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93bf5031c1614091345759dfe8561d68  cinnamon-1.5.0.git49593cb.tar.gz
+7314b9cf730830c1fa3f9926f7c4272a  cinnamon-1.5.2.tar.gz


More information about the scm-commits mailing list