rpms/xscreensaver/F-10 xscreensaver.spec,1.75,1.76

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv838/F-10

Modified Files:
	xscreensaver.spec 
Log Message:
apply webcollage default change on devel to other branches


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xscreensaver.spec	11 Sep 2008 16:22:19 -0000	1.75
+++ xscreensaver.spec	25 Nov 2008 14:56:18 -0000	1.76
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -523,9 +523,12 @@
    COMMENT=`echo $COMMENT`
 
 # webcollage treatment
+## changed to create wrapper script
+%if 0
    if [ "x$COMMAND" = "xwebcollage" ] ; then
       ARG="$ARG -directory %{_datadir}/backgrounds/images"
    fi
+%endif
 
    if [ "x$NAME" = "x" ] ; then NAME=$COMMAND ; fi
 
@@ -569,6 +572,23 @@
    set -x
 done
 
+# Create wrapper script for webcollage to use nonet option
+# by default, and rename the original webcollage
+# (see bug 472061)
+pushd ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
+mv -f webcollage webcollage.original
+
+cat > webcollage <<EOF
+#!/bin/sh
+PATH=%{_libexecdir}/%{name}:\$PATH
+exec webcollage.original \\
+	-directory %{_datadir}/backgrounds/images \\
+	"\$@"
+EOF
+chmod 0755 webcollage
+echo "%%{_libexecdir}/%%{name}/webcollage.original" >> \
+	$dd/extras.files
+
 # Make sure all files are readable by all, and writable only by owner.
 #
 chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT}
@@ -611,6 +631,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Nov 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-3
+- Create wrapper script for webcollage to use nonet option
+  by default, and rename the original webcollage (bug 472061)
+
 * Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
 - Update ja.po
 - Fix the explanation in XScreenSaver.ad (bug 461415)