[cinnamon] update to 2.0.3

leigh123linux leigh123linux at fedoraproject.org
Fri Oct 18 16:32:44 UTC 2013


commit ab915e5a6859e1482b53b88fab0473570b890a56
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Oct 18 17:32:38 2013 +0100

    update to 2.0.3

 .gitignore           |    1 +
 autostart.patch      |   18 ++++++++++++++++++
 autostart_nemo.patch |   18 ------------------
 cinnamon.spec        |   13 +++++++------
 sources              |    2 +-
 5 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18f5a6f..16cef97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /cinnamon-1.9.2.git8a53cfb.tar.gz
 /cinnamon-1.9.2.tar.gz
 /Cinnamon-2.0.2.tar.gz
+/Cinnamon-2.0.3.tar.gz
diff --git a/autostart.patch b/autostart.patch
new file mode 100644
index 0000000..1d35f67
--- /dev/null
+++ b/autostart.patch
@@ -0,0 +1,18 @@
+--- a/files/usr/share/cinnamon-session/sessions/cinnamon.session
++++ b/files/usr/share/cinnamon-session/sessions/cinnamon.session
+@@ -1,5 +1,5 @@
+ [Cinnamon Session]
+ Name=Cinnamon
+-RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;cinnamon-fallback-mount-helper;nemo-autostart;nm-applet;
++RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;cinnamon-fallback-mount-helper;nemo-autostart;cinnamon-nm-applet;
+ DesktopName=GNOME
+ 
+--- a/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
++++ b/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
+@@ -1,5 +1,5 @@
+ [Cinnamon Session]
+ Name=Cinnamon (Software Rendering)
+-RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;cinnamon-fallback-mount-helper;nemo-autostart;nm-applet;
++RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;cinnamon-fallback-mount-helper;nemo-autostart;cinnamon-nm-applet;
+ DesktopName=GNOME
+ 
diff --git a/cinnamon.spec b/cinnamon.spec
index 6fcf012..7bfc0a5 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
 #global _internal_version  8a53cfb
 
 Name:           cinnamon
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -17,14 +17,12 @@ Source2:        org.cinnamon.settings-users.policy
 Source3:        cinnamon-nm-applet.desktop
 
 Patch0:         background.patch
-Patch1:         autostart_nemo.patch
+Patch1:         autostart.patch
 Patch2:         replace_gksu.patch
 Patch3:         cinnamon-settings-apps.patch
 Patch4:         keyboard_applet.patch
 Patch5:         input_keybindings.patch
 Patch6:         bluetooth.patch
-# upstream commits
-Patch7:         git_rollup_fixes.patch
 
 %global clutter_version 1.12.2
 %global cjs_version 1.9.1
@@ -146,7 +144,6 @@ The emphasis is put on making users feel at home and providing
 %if 0%{?fedora} < 20
 %patch6 -p1
 %endif
-%patch7 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -172,6 +169,7 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon2d.deskto
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-settings-users.desktop
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-menu-editor.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-nm-applet.desktop
 
 desktop-file-install                                 \
  --add-category="Utility"                            \
@@ -226,6 +224,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 18 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.3-1
+- update to 2.0.3
+
 * Thu Oct 17 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-3
 - add custom nm-applet file as the stock one is set to NotShowIn Gnome
 
diff --git a/sources b/sources
index 65d86f4..7646335 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d01abf29a3e19bea9075cb4694398ad4  Cinnamon-2.0.2.tar.gz
+2c587a9f905d060394daf92f4dff240c  Cinnamon-2.0.3.tar.gz


More information about the scm-commits mailing list