[cinnamon] Update to the latest snapshot

leigh123linux leigh123linux at fedoraproject.org
Tue Jul 24 21:43:21 UTC 2012


commit 15f97eac4c6476953be719fecd603e173fc89135
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Jul 24 22:43:14 2012 +0100

    Update to the latest snapshot
    
    - Remove buildrequires telepathy-glib-devel, telepathy-logger-devel and folks-devel
    - Drop obsolete patches

 .gitignore                    |    1 +
 cinnamon-1.4.1_settings.patch |  359 -----------------------------------------
 cinnamon.spec                 |   20 ++--
 port-window-gsettings.patch   |   40 -----
 sources                       |    2 +-
 5 files changed, 12 insertions(+), 410 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd557e9..cd2a0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cinnamon-1.4.1.git7959517.tar.gz
+/cinnamon-1.5.0.git49593cb.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 18fd6f7..ed130bc 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global        _internal_version  7959517
+%global        _internal_version  49593cb
 
 %{?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.0
+Release:        0.1.git%{_internal_version}%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -28,7 +28,7 @@ Source5:        menu.png
 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,8 +38,7 @@ 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
@@ -61,8 +60,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 +67,6 @@ BuildRequires:  gtk3-devel
 BuildRequires:  intltool
 BuildRequires:  libcanberra-devel
 BuildRequires:  libcroco-devel
-BuildRequires:  folks-devel
 
 # for barriers
 BuildRequires:  libXfixes-devel >= 5.0
@@ -125,7 +121,6 @@ The emphasis is put on making users feel at home and providing
 # upstream patches and pending pulls
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 
 # remove gschema
@@ -233,6 +228,11 @@ fi
 
 
 %changelog
+* 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
+- Drop obsolete patches
+
 * 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..35a5294 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b6fecfc2ca44366222e54fb44269600  cinnamon-1.4.1.git7959517.tar.gz
+93bf5031c1614091345759dfe8561d68  cinnamon-1.5.0.git49593cb.tar.gz


More information about the scm-commits mailing list