[cinnamon] update to 2.0.14

[leigh123linux]

commit 5e838c118a827f1bc3ab371add76fb7e0ddef43c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 26 18:06:29 2013 +0000

    update to 2.0.14

 .gitignore                 |    1 +
 autostart.patch            |    4 +-
 cinnamon-nm-applet.desktop |  140 --------------------------------------------
 cinnamon.spec              |   23 +++-----
 restore_panel_bounce.patch |   33 ----------
 sources                    |    2 +-
 6 files changed, 13 insertions(+), 190 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71e975a..a3f0ce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /Cinnamon-2.0.11.tar.gz
 /Cinnamon-2.0.12.tar.gz
 /Cinnamon-2.0.13.tar.gz
+/Cinnamon-2.0.14.tar.gz
diff --git a/autostart.patch b/autostart.patch
index c43bb98..73dae9c 100644
--- a/autostart.patch
+++ b/autostart.patch
@@ -4,7 +4,7 @@
  [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;polkit-cinnamon-authentication-agent-1;
++RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;cinnamon-fallback-mount-helper;nemo-autostart;polkit-cinnamon-authentication-agent-1;
  DesktopName=GNOME
  
 --- a/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
@@ -13,6 +13,6 @@
  [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;polkit-cinnamon-authentication-agent-1;
++RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;cinnamon-fallback-mount-helper;nemo-autostart;polkit-cinnamon-authentication-agent-1;
  DesktopName=GNOME
  
diff --git a/cinnamon.spec b/cinnamon.spec
index 36cd578..4435eaf 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
 #global _internal_version  8a53cfb
 
 Name:           cinnamon
-Version:        2.0.13
-Release:        3%{?dist}
+Version:        2.0.14
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -14,8 +14,7 @@ URL:            http://cinnamon.linuxmint.com
 Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/Cinnamon-%{version}.tar.gz
 Source1:        cinnamon-fedora.gschema.override
 Source2:        org.cinnamon.settings-users.policy
-Source3:        cinnamon-nm-applet.desktop
-Source4:        polkit-cinnamon-authentication-agent-1.desktop
+Source3:        polkit-cinnamon-authentication-agent-1.desktop
 
 Patch0:         background.patch
 Patch1:         autostart.patch
@@ -24,7 +23,6 @@ Patch3:         cinnamon-settings-apps.patch
 Patch4:         keyboard_applet.patch
 Patch5:         input_keybindings.patch
 Patch6:         bluetooth.patch
-Patch7:         restore_panel_bounce.patch
 
 %global clutter_version 1.12.2
 %global cjs_version 1.9.1
@@ -130,9 +128,6 @@ Obsoletes:      cinnamon-settings
 Obsoletes:      cinnamon-menu-editor
 Obsoletes:      cinnamon <= 1.8.0-1
 
-# wallpapoz breaks cinnamon background
-# https://bugzilla.redhat.com/show_bug.cgi?id=1029554
-Conflicts:      wallpapoz
 
 %description
 Cinnamon is a Linux desktop which provides advanced
@@ -154,7 +149,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
@@ -175,18 +169,14 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
 
 install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
 
-# install custom nm-applet desktop file
-install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/applications/
-
 # install polkik autostart desktop file
-install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/applications/
+install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/applications/
 
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon.desktop
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon2d.desktop
 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-validate $RPM_BUILD_ROOT/%{_datadir}/applications/polkit-cinnamon-authentication-agent-1.desktop
 
 desktop-file-install                                 \
@@ -239,6 +229,11 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 26 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-1
+- update to 2.0.14
+- remove conflicts wallpapoz (bz 1029554)
+- remove nm-applet from autostart (bz 1034887)
+
 * Sun Nov 24 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.13-3
 - patch to restore panel icon bounce
 
diff --git a/sources b/sources
index 43eb3a6..7889db4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ccae909b72a0ca566a80fcce6e3fd5f9  Cinnamon-2.0.13.tar.gz
+566129434434d3a2f81dfaa4f33a5abb  Cinnamon-2.0.14.tar.gz