rpms/xscreensaver/devel xscreensaver.spec,1.98,1.99

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Log Message:
* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
- Restrict Autostart effect to GNOME session only (bug 517391)
- Use planet.fedoraproject.org for textURL (still the default textMode
  is "file", i.e. no net connection)



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- xscreensaver.spec	8 Sep 2009 05:41:04 -0000	1.98
+++ xscreensaver.spec	7 Oct 2009 20:33:55 -0000	1.99
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    2
 
 %define extrarel      %{nil}
 
@@ -14,6 +14,7 @@
 %else
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
 %endif
+%define default_URL   http://planet.fedoraproject.org/rss20.xml
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -258,7 +259,8 @@ change_option driver/XScreenSaver.ad.in 
    lock=True \
    splash=False \
    ignoreUninstalledPrograms=True \
-   textProgram=fortune\ -s
+   textProgram=fortune\ -s \
+   textURL=%{default_URL}
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -533,12 +535,14 @@ cd ..
 %endif
 
 # Install desktop application autostart stuff
+# Add OnlyShowIn=GNOME (bug 517391)
 %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 \
+   --add-only-show-in=GNOME \
    %{SOURCE12}
 chmod 0644 ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop
 
@@ -666,6 +670,11 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
+- Restrict Autostart effect to GNOME session only (bug 517391)
+- Use planet.fedoraproject.org for textURL (still the default textMode
+  is "file", i.e. no net connection)
+
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
 - Update to 5.10
 - All non Fedora-specific patches applied upstream