[cinnamon/f18] autostart for gnome-screensaver so lock works

[leigh123linux]

commit b91800acb60bba31cc246851a861d3242d323942
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Oct 13 13:29:01 2012 +0100

    autostart for gnome-screensaver so lock works
    
    - mozilla desktop fix

 cinnamon-screensaver.desktop   |   15 +++++++++++++++
 cinnamon.spec                  |   13 ++++++++++++-
 cinnamon2d-screensaver.desktop |   15 +++++++++++++++
 3 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-screensaver.desktop b/cinnamon-screensaver.desktop
new file mode 100644
index 0000000..ddc9686
--- /dev/null
+++ b/cinnamon-screensaver.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=gnome-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-screensaver
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.6.0
diff --git a/cinnamon.spec b/cinnamon.spec
index 68a6966..b70f515 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -8,7 +8,7 @@
 
 Name:           cinnamon
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -21,6 +21,8 @@ Source1:        cinnamon.desktop
 Source2:        cinnamon.session
 Source3:        cinnamon2d.desktop
 Source4:        cinnamon2d.session
+Source5:        cinnamon-screensaver.desktop
+Source6:        cinnamon2d-screensaver.desktop
 
 
 # Fix menu structure
@@ -171,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
 # Remove firefox plugin
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/mozilla
 
+# Add autostart files for gnome-screensaver
+mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
+install -pm 0644 %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
+
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon2d.desktop
 
@@ -205,6 +211,7 @@ fi
 %{_bindir}/cinnamon-extension-tool
 %{_sysconfdir}/xdg/menus/cinnamon-applications.menu
 %{_sysconfdir}/xdg/menus/cinnamon-settings.menu
+%{_sysconfdir}/xdg/autostart/cinnamon*-screensaver.desktop
 %{_datadir}/desktop-directories/cinnamon-*.directory
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/applications/cinnamon.desktop
@@ -223,6 +230,10 @@ fi
 
 
 %changelog
+* Sat Oct 13 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-3
+- autostart for gnome-screensaver so lock works
+- mozilla desktop fix
+
 * Tue Oct 09 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-2
 - fix settings applet icons
 - patch font size (Bzr 864050)
diff --git a/cinnamon2d-screensaver.desktop b/cinnamon2d-screensaver.desktop
new file mode 100644
index 0000000..aed9557
--- /dev/null
+++ b/cinnamon2d-screensaver.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon2d Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=gnome-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon2d
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-screensaver
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.6.0