[cinnamon] fix control-center settings on x86_64

[leigh123linux]

commit 366385054eab6473b5847e1bd8d05ea42d4512da
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 24 18:44:47 2013 +0100

    fix control-center settings on x86_64
    
    - drop clutter xinput patch
    - add missing requirements for cinnamon-settings
    - redo screensaver patch to enable/disable lock password

 cinnamon.spec        |   31 +++++++++++++++++++++++--------
 disable_xinput.patch |   15 ---------------
 2 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 4111281..47928fa 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon
 Version:        1.9.2
-Release:        0.1.git%{_internal_version}%{?dist}
+Release:        0.2.git%{_internal_version}%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -15,11 +15,11 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}
 Source1:        cinnamon-fedora.gschema.override
 
 
-Patch0:         disable_xinput.patch
-Patch1:         background.patch
-Patch2:         bluetooth_obex_transfer.patch
-Patch3:         autostart_nemo.patch
-Patch4:         menu_editor.patch
+Patch0:         background.patch
+Patch1:         bluetooth_obex_transfer.patch
+Patch2:         autostart_nemo.patch
+Patch3:         menu_editor.patch
+Patch4:         screensaver.patch
 Patch5:         keyboard_applet.patch
 Patch6:         idle-dim.patch
 
@@ -100,10 +100,13 @@ Requires:       dbus-python
 Requires:       python-lxml
 Requires:       gnome-python2-gconf
 Requires:       python-pillow
+Requires:       PyPAM
+Requires:       python-pexpect
+Requires:       opencv-python
+Requires:       cinnamon-control-center
+Requires:       cinnamon-screensaver
 # nemo is a RequiredComponents in the session files
 Requires:       nemo
-# gnome-screensaver is a RequiredComponents in the session files
-Requires:       cinnamon-screensaver
 
 Obsoletes:      cinnamon-2d
 Obsoletes:      cinnamon-settings
@@ -167,6 +170,12 @@ desktop-file-install                                 \
  --dir=$RPM_BUILD_ROOT/%{_datadir}/applications       \
  $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-settings.desktop
 
+# fix hard coded path
+%ifarch x86_64
+sed -i -e 's@/usr/lib/cinnamon-control-center@/usr/lib64/cinnamon-control-center at g' \
+$RPM_BUILD_ROOT/%{_prefix}/lib/cinnamon-settings/bin/capi.py
+%endif
+
 %find_lang %{name}
 
 %postun
@@ -196,6 +205,12 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 24 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.2.gitc321232
+- fix control-center settings on x86_64
+- drop clutter xinput patch
+- add missing requirements for cinnamon-settings
+- redo screensaver patch to enable/disable lock password
+
 * Tue Jul 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.1.gitc321232
 - rebase for cinnamon next