rpms/xscreensaver/devel xscreensaver.spec,1.32,1.33

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18242

Modified Files:
	xscreensaver.spec 
Log Message:
* Fri Sep 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-3
- Fix the arguments of desktop files (#208560)



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xscreensaver.spec	26 Sep 2006 14:03:11 -0000	1.32
+++ xscreensaver.spec	29 Sep 2006 14:41:33 -0000	1.33
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -339,6 +339,7 @@
    COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
    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`
    COMMENT="`cat $1 | sed -e '1,/_description/d' | \
      sed -e '/_description/q' | sed -e '/_description/d'`"
    COMMENT=`echo $COMMENT`
@@ -371,15 +372,19 @@
    echo "%%defattr(-,root,root)" > $glist
    echo "%%dir $SAVERDIR" >> $glist
 
+   set +x
    for xml in `cat $list | grep xml$` ; do
       file=${RPM_BUILD_ROOT}${xml}
       desktop=xscreensaver-`basename $file`
       desktop=${desktop%.xml}.desktop
 
+      set -x
       create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       echo ${SAVERDIR}/$desktop >> $glist
+      set +x
    done
 done
+set -x
 
 # Make sure all files are readable by all, and writable only by owner.
 #
@@ -404,6 +409,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Sep 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-3
+- Fix the arguments of desktop files (#208560)
+
 * Tue Sep 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-2
 - Finally move man pages to 6x (#205796)
 - Fix the ownership of directories (#187892)