rpms/xscreensaver/F-12 xscreensaver.spec,1.109,1.110

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv630/F-12

Modified Files:
	xscreensaver.spec 
Log Message:
* Thu Jun 24 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.respin1
- Make hacks' names in gss compat desktop files written in full path
  (ref: bug 531151)
- Update gss compat desktop creation



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- xscreensaver.spec	14 Jun 2010 09:10:42 -0000	1.109
+++ xscreensaver.spec	23 Jun 2010 15:45:11 -0000	1.110
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4.1
+%define fedora_rel    5
 
 %define extrarel      .respin1
 
@@ -574,6 +574,15 @@ echo '%{_sysconfdir}/xdg/autostart/xscre
 # bug 204944, 208560
 create_desktop(){
    COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
+# COMMAND must be full path (see bug 531151)
+# Check if the command actually exists
+   COMMAND=%{_libexecdir}/xscreensaver/$COMMAND
+   if [ ! -x $RPM_BUILD_ROOT/$COMMAND ] ; then
+      echo
+      echo "WARNING:"
+      echo "$COMMAND could not be found under $RPM_BUILD_ROOT"
+      #exit 1
+   fi
    NAME=`cat $1 | sed -n -e 's|^<screen.*_label=\"\(.*\)\">.*$|\1|p'`
    ARG=`cat $1 | sed -n -e 's|^.*<command arg=\"\([^ ][^ ]*\)\".*$|\1|p'`
    ARG=$(echo "$ARG" | while read line ; do echo -n "$line " ; done)
@@ -593,7 +602,7 @@ create_desktop(){
 
    rm -f $2
    echo "[Desktop Entry]" >> $2
-   echo "Encoding=UTF-8" >> $2
+#   echo "Encoding=UTF-8" >> $2
    echo "Name=$NAME" >> $2
    echo "Comment=$COMMENT" >> $2
    echo "TryExec=$COMMAND" >> $2
@@ -690,6 +699,11 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jun 24 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.respin1
+- Make hacks' names in gss compat desktop files written in full path
+  (ref: bug 531151)
+- Update gss compat desktop creation
+
 * Mon Jun 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-4.1.respin1
 - Fix crash of xjack when window is too small (bug 603587)