[cinnamon/f17] update to 1.6.0 release

[leigh123linux]

commit e560a5ec9a016c2c864fd7d1398bfcdf0572ce28
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Sep 18 14:26:27 2012 +0100

    update to 1.6.0 release
    
    - drop upstream patches
    - add requires python-imaging, gnome-python2-gconf and python-imaging
    - patch to use nautilus instead of nemo

 cinnamon-1.4.1_f17_favourite-apps-firefox.patch |    4 +-
 cinnamon.spec                                   |   37 +++++++++++++++-------
 sources                                         |    2 +-
 systray.patch                                   |   30 ------------------
 window_quick_list.patch                         |   11 -------
 5 files changed, 28 insertions(+), 56 deletions(-)
---
diff --git a/cinnamon-1.4.1_f17_favourite-apps-firefox.patch b/cinnamon-1.4.1_f17_favourite-apps-firefox.patch
index a5ea847..b17c135 100644
--- a/cinnamon-1.4.1_f17_favourite-apps-firefox.patch
+++ b/cinnamon-1.4.1_f17_favourite-apps-firefox.patch
@@ -4,7 +4,7 @@
      </key>
      
      <key name="panel-launchers" type="as">
--      <default>[ 'firefox.desktop', 'gnome-terminal.desktop', 'nautilus.desktop']</default>
+-      <default>[ 'firefox.desktop', 'gnome-terminal.desktop', 'nemo.desktop']</default>
 +      <default>[ 'firefox.desktop', 'gnome-terminal.desktop', 'nautilus.desktop']</default>
        <_summary>Desktop files of the applications to put in the panel launchers applet</_summary>
        <_description>
@@ -13,7 +13,7 @@
      </key>
  
      <key name="favorite-apps" type="as">
--      <default>[ 'firefox.desktop', 'mintInstall.desktop', 'cinnamon-settings.desktop', 'xchat.desktop', 'gnome-terminal.desktop', 'nautilus.desktop' ]</default>
+-      <default>[ 'firefox.desktop', 'mintInstall.desktop', 'cinnamon-settings.desktop', 'xchat.desktop', 'gnome-terminal.desktop', 'nemo.desktop' ]</default>
 +      <default>[ 'cinnamon-settings.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
        <_summary>List of desktop file IDs for favorite applications</_summary>
        <_description>
diff --git a/cinnamon.spec b/cinnamon.spec
index 2793995..9aead9b 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global        _internal_version  9e88200
+%global        _internal_version  bd02368
 
 %{?filter_setup:
 %filter_from_provides /^libcinnamon.so/d;
@@ -7,8 +7,8 @@
 }
 
 Name:           cinnamon
-Version:        1.5.2
-Release:        6%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -29,15 +29,14 @@ 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
 Patch3:         fedora_icon.patch
+Patch4:         nemo.patch
 
 # upstream patches and pending pulls
-Patch11:        systray.patch
-Patch12:        window_quick_list.patch
 
 
 %global clutter_version 1.7.5
 %global gobject_introspection_version 0.10.1
-%global muffin_version 1.0.5
+%global muffin_version 1.1.0
 %global eds_version 2.91.6
 %global json_glib_version 0.13.2
 
@@ -102,6 +101,9 @@ Requires:       accountsservice-libs
 Requires:       pygobject2
 Requires:       dbus-python
 Requires:       nautilus
+Requires:       python-lxml
+Requires:       gnome-python2-gconf
+Requires:       python-imaging
 
 %description
 Cinnamon is a Linux desktop which provides advanced
@@ -119,9 +121,11 @@ The emphasis is put on making users feel at home and providing
 %patch2 -p1
 %patch3 -p1
 
+# use nautilus instead of nemo
+%patch4 -p1
+
+
 # upstream patches and pending pulls
-%patch11 -p1
-%patch12 -p1
 
 
 # remove gschema
@@ -155,7 +159,7 @@ rm -f configure
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
 NOCONFIGURE=1 ./autogen.sh
-%configure --disable-static --enable-compile-warnings=minimum
+%configure --disable-static
 make V=1 %{?_smp_mflags}
 
 %install
@@ -213,12 +217,21 @@ fi
 %{_datadir}/cinnamon-settings/
 %{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 %{_libdir}/cinnamon/
-%{_libexecdir}/cinnamon-perf-helper
-%{_libexecdir}/cinnamon-hotplug-sniffer
-%{_mandir}/man1/%{name}.1.*
+%{_libexecdir}/cinnamon/cinnamon-perf-helper
+%{_libexecdir}/cinnamon/cinnamon-hotplug-sniffer
+%{_mandir}/man1/*.1.*
 
 
 %changelog
+* Tue Sep 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.0-1
+- update to 1.6.0 release
+- drop upstream patches
+- add requires python-imaging, gnome-python2-gconf and python-imaging
+- patch to use nautilus instead of nemo
+
+* Tue Sep 11 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.8-1
+- update to 1.5.8 release
+
 * Sun Aug 19 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-6
 - use patch to fix windows quick list applet
 
diff --git a/sources b/sources
index e723498..7ea6b45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7314b9cf730830c1fa3f9926f7c4272a  cinnamon-1.5.2.tar.gz
+236c4007c0b27286b966ba0d8d768f1a  cinnamon-1.6.0.tar.gz