rpms/xscreensaver/devel xscreensaver-autostart, NONE, 1.1 xscreensaver-autostart.desktop, NONE, 1.1 xscreensaver.spec, 1.92, 1.93

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25834

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-autostart xscreensaver-autostart.desktop 
Log Message:
* Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-12
- Install desktop application autostart stuff



--- NEW FILE xscreensaver-autostart ---
#!/bin/sh

# Don't launch xscreensaver if gnome-screensaver
# is installed

if [ -x /usr/bin/gnome-screensaver ] ; then exit 0 ; fi

exec xscreensaver -nosplash


--- NEW FILE xscreensaver-autostart.desktop ---
[Desktop Entry]
Type=Application
Name=xscreensaver-autostart
Comment=Autostart xscreensaver
Exec=/usr/libexec/xscreensaver-autostart
Terminal=false


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- xscreensaver.spec	25 Jul 2009 13:09:33 -0000	1.92
+++ xscreensaver.spec	30 Jul 2009 08:40:11 -0000	1.93
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    11
+%define fedora_rel    12
 
 %define extrarel      %{nil}
 
@@ -31,6 +31,8 @@ Source0:         http://www.jwz.org/xscr
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+Source11:        xscreensaver-autostart
+Source12:        xscreensaver-autostart.desktop
 # bug 129335
 # sanitize the names of modes in barcode
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
@@ -542,6 +544,20 @@ done
 cd ..
 %endif
 
+# Install desktop application autostart stuff
+%if 0%{?fedora} >= 12
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
+install -cpm 0755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_libexecdir}/
+desktop-file-install \
+   --vendor "" \
+   --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+   %{SOURCE12}
+chmod 0644 ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop
+
+echo "%{_libexecdir}/xscreensaver-autostart" >> $dd/base.files
+echo '%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop' >> $dd/base.files
+%endif
+
 # Create desktop entry for gnome-screensaver
 # bug 204944, 208560
 create_desktop(){
@@ -662,6 +678,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-12
+- Install desktop application autostart stuff
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-11
 - Build fix for new xextproto (libXext 1.0.99.3)
 - Fix for breaking strict aliasing rule