rpms/xscreensaver/FC-6 xscreensaver-5.01-webcollage-default-nonet.patch, NONE, 1.1 xscreensaver.spec, 1.33, 1.34

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10434

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.01-webcollage-default-nonet.patch 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-5
- Require xorg-x11-resutils (#216245)


xscreensaver-5.01-webcollage-default-nonet.patch:

--- NEW FILE xscreensaver-5.01-webcollage-default-nonet.patch ---
--- xscreensaver-5.01/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.01/hacks/config/webcollage.xml	2006-11-06 04:29:32.000000000 +0900
@@ -20,7 +20,7 @@
 
   <string id="filter2" _label="Overall Filter Program" arg="-filter2 %"/>
 
-<!-- <file id="dictionary" _label="Dictionary File" arg="-dictionary %"/> -->
+  <file id="directory" _label="Image search directory" arg="-directory %"/>
 
   <_description>
 This program makes collages out of random images pulled off of the
--- xscreensaver-5.01/driver/XScreenSaver.ad.in.nonet	2006-11-06 04:14:04.000000000 +0900
+++ xscreensaver-5.01/driver/XScreenSaver.ad.in	2006-11-06 04:19:38.000000000 +0900
@@ -302,10 +302,12 @@
 				fiberlamp -root				    \n\
 				boxfit -root				    \n\
 				celtic -root				    \n\
-- default-n:			webcollage -root			    \n\
+- default-n:			webcollage -root			      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:  "WebCollage (whacked)"					      \
 				webcollage -root -filter		      \
-				  'vidwhacker -stdin -stdout'		    \n\
+				  'vidwhacker -stdin -stdout'		      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:			vidwhacker -root			    \n\
 									      \
 @GL_KLUDGE@ GL:			gears -root				    \n\


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/xscreensaver.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xscreensaver.spec	29 Sep 2006 14:41:33 -0000	1.33
+++ xscreensaver.spec	21 Nov 2006 09:05:38 -0000	1.34
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    3
+%define fedora_rel    5
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -25,6 +25,7 @@
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch8:          xscreensaver-5.00b5-include-directory.patch
+Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
 Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
 
 %package base
@@ -50,6 +51,7 @@
 BuildRequires:   fedora-release
 Requires:        /etc/pam.d/system-auth
 Requires:        pam > %{pam_ver}
+Requires:        xorg-x11-resutils
 Provides:        xscreensaver = %{epoch}:%{version}-%{release}
 Obsoletes:       xscreensaver
 
@@ -135,6 +137,7 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch8 -p1 -b .include-dir
+%patch21 -p1 -b .nonet
 # don't apply for now
 %if %{allow_non_passwd}
 %patch114 -p1 -b .non-passwd
@@ -272,7 +275,7 @@
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category X-Red-Hat-Base                         \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # This function prints a list of things that get installed.
 # It does this by parsing the output of a dummy run of "make install".
@@ -335,7 +338,6 @@
 
 # create desktop entry for gnome-screensaver
 create_desktop(){
-   set +x
    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'`
@@ -344,6 +346,11 @@
      sed -e '/_description/q' | sed -e '/_description/d'`"
    COMMENT=`echo $COMMENT`
 
+# webcollage treatment
+   if [ "x$COMMAND" = "xwebcollage" ] ; then
+      ARG="$ARG -directory %{_datadir}/backgrounds/images"
+   fi
+
    if [ "x$NAME" = "x" ] ; then NAME=$COMMAND ; fi
 
    rm -f $2
@@ -356,7 +363,6 @@
    echo "StartupNotify=false" >> $2
    echo "Type=Application" >> $2
    echo "Categories=Screensaver" >> $2
-   set -x
 }
 
 cd $dd
@@ -378,13 +384,12 @@
       desktop=xscreensaver-`basename $file`
       desktop=${desktop%.xml}.desktop
 
-      set -x
+      echo + create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       echo ${SAVERDIR}/$desktop >> $glist
-      set +x
    done
+   set -x
 done
-set -x
 
 # Make sure all files are readable by all, and writable only by owner.
 #
@@ -409,6 +414,12 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Nov 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-5
+- Require xorg-x11-resutils (#216245)
+
+* Sun Nov  5 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-4
+- No net connection by default for webcollage (possibly fix #214095 ?)
+
 * 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)