[cinnamon/f19] Fix media keys

[leigh123linux]

commit 49c70df65576d3f6957e9e057830f2ebe537bbef
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Jun 9 23:42:10 2013 +0100

    Fix media keys

 .gitignore           |    1 +
 autostart_nemo.patch |    4 ++--
 cinnamon.spec        |   29 ++++++++++++++++++++++++++++-
 sources              |    1 +
 4 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aec2092..f89b38d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /cinnamon-1.8.6.tar.gz
 /cinnamon-1.8.7.tar.gz
 /cinnamon-1.9.1.tar.gz
+/gnome-settings-daemon-compat-3.6.4.tar.xz
diff --git a/autostart_nemo.patch b/autostart_nemo.patch
index 37f24a2..c3833bc 100644
--- a/autostart_nemo.patch
+++ b/autostart_nemo.patch
@@ -4,7 +4,7 @@
  [GNOME Session]
  Name=Cinnamon
 -RequiredComponents=cinnamon;gnome-settings-daemon;
-+RequiredComponents=cinnamon;gnome-settings-daemon;nemo-autostart;cinnamon-screensaver;
++RequiredComponents=cinnamon;gnome-settings-daemon;nemo-autostart;cinnamon-screensaver;gnome-fallback-media-keys-helper;
  DesktopName=GNOME
  
 --- a/files/usr/share/gnome-session/sessions/cinnamon2d.session
@@ -13,6 +13,6 @@
  [GNOME Session]
  Name=Cinnamon (Software Rendering)
 -RequiredComponents=cinnamon2d;gnome-settings-daemon;
-+RequiredComponents=cinnamon2d;gnome-settings-daemon;nemo-autostart;cinnamon2d-screensaver;
++RequiredComponents=cinnamon2d;gnome-settings-daemon;nemo-autostart;cinnamon2d-screensaver;gnome-fallback-media-keys-helper;
  DesktopName=GNOME
  
diff --git a/cinnamon.spec b/cinnamon.spec
index 3effbd7..32968ba 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
 Name:           cinnamon
 Version:        1.9.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -11,6 +11,7 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}
 Source1:        cinnamon-fedora.gschema.override
 Source2:        cinnamon-screensaver.desktop
 Source3:        cinnamon2d-screensaver.desktop
+Source4:        http://leigh123linux.fedorapeople.org/pub/gnome-settings-daemon-compat/source/gnome-settings-daemon-compat-3.6.4.tar.xz
 
 Patch0:         gnome-3.8-compat.patch
 Patch1:         background.patch
@@ -59,6 +60,17 @@ BuildRequires:  gnome-bluetooth >= 2.91
 %endif
 # Bootstrap requirements
 BuildRequires: gtk-doc gnome-common
+# mediia keys
+BuildRequires:  gsettings-desktop-schemas-devel
+BuildRequires:  libnotify-devel
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  glib2-devel
+BuildRequires:  lcms2-devel
+BuildRequires:  colord-devel
+BuildRequires:  libwacom-devel
+BuildRequires:  xorg-x11-drv-wacom-devel
+BuildRequires:  libXtst-devel
+
 Requires:       gnome-menus%{?_isa} >= 3.0.0-2
 # wrapper script uses to restart old GNOME session if run --replace
 # from the command line
@@ -103,6 +115,7 @@ The emphasis is put on making users feel at home and providing
  them with an easy to use and comfortable desktop experience.
 
 %prep
+%setup -q -T -b4 -n gnome-settings-daemon-compat-3.6.4
 %setup -q -n Cinnamon-%{version}
 %patch0 -p1
 %patch1 -p1
@@ -123,6 +136,14 @@ NOCONFIGURE=1 ./autogen.sh
 
 make %{?_smp_mflags} V=1
 
+# media-keys-helper
+cd ../gnome-settings-daemon-compat-3.6.4
+autoreconf -fi
+%configure --libexecdir=%{_libexecdir}/%{name} --disable-static --disable-ibus \
+ --disable-cups --disable-smartcard-support --disable-packagekit
+make %{?_smp_mflags} V=1 -C plugins/common
+make %{?_smp_mflags} V=1 -C plugins/media-keys
+
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
@@ -149,6 +170,9 @@ desktop-file-install                                 \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications       \
  $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-settings.desktop
 
+pushd ../gnome-settings-daemon-compat-3.6.4
+make -C plugins/media-keys DESTDIR=$RPM_BUILD_ROOT install
+popd
 
 %find_lang %{name}
 
@@ -179,6 +203,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jun 09 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-8
+- Fix media keys
+
 * Thu Jun 06 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-7
 - change how the screen lock autostarts
 
diff --git a/sources b/sources
index a4e2749..3506971 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 9e9b19adaaf1fb4fa3595a422bf69eee  cinnamon-1.9.1.tar.gz
+89df25123c44ed13eea36b6f818c6eb0  gnome-settings-daemon-compat-3.6.4.tar.xz