rpms/xscreensaver/devel xscreensaver-5.05-addopts.patch, NONE, 1.1 xscreensaver-5.05-webcollage-default-nonet.patch, NONE, 1.1 xscreensaver.spec, 1.65, 1.66 xscreensaver-5.04-gcc43.patch, 1.1, NONE xscreensaver-5.04-webcollage-default-nonet.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.05-addopts.patch 
	xscreensaver-5.05-webcollage-default-nonet.patch 
Removed Files:
	xscreensaver-5.04-gcc43.patch 
	xscreensaver-5.04-webcollage-default-nonet.patch 
Log Message:
* Sun Mar  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-1
- Update to 5.05


xscreensaver-5.05-addopts.patch:

--- NEW FILE xscreensaver-5.05-addopts.patch ---
--- xscreensaver-5.05/configure.in.opts	2008-03-02 22:41:39.000000000 +0900
+++ xscreensaver-5.05/configure.in	2008-03-02 22:48:04.000000000 +0900
@@ -395,10 +395,18 @@
 ])
 
 AC_DEFUN(AC_NO_LONG_STRING_WARNINGS,
-         [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings)])
+         [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings)
+         if test $ac_gcc_accepts_no_overlength = yes ; then
+            CC="$CC -Wno-overlength-strings"
+         fi
+])
 
 AC_DEFUN(AC_NO_MISPLACED_DECLARATIONS,
-         [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)])
+         [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)
+         if test $ac_gcc_accepts_no_decl_after = yes ; then
+            CC="$CC -Wdeclaration-after-statement"
+         fi
+])
 
 
 ###############################################################################

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

--- NEW FILE xscreensaver-5.05-webcollage-default-nonet.patch ---
--- xscreensaver-5.05/driver/XScreenSaver.ad.in.nonet	2008-03-02 06:33:47.000000000 +0900
+++ xscreensaver-5.05/driver/XScreenSaver.ad.in	2008-03-02 20:13:51.000000000 +0900
@@ -306,10 +306,12 @@
 				m6502 -root				    \n\
 				abstractile -root			    \n\
 -				lcdscrub -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\
--- xscreensaver-5.05/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.05/hacks/config/webcollage.xml	2008-03-02 20:09:16.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


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- xscreensaver.spec	10 Feb 2008 11:56:01 -0000	1.65
+++ xscreensaver.spec	2 Mar 2008 14:16:58 -0000	1.66
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define version       5.04
+%define version       5.05
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -31,8 +31,8 @@
 Source10:        update-xscreensaver-hacks
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
-Patch2:          xscreensaver-5.04-gcc43.patch
-Patch21:         xscreensaver-5.04-webcollage-default-nonet.patch
+Patch3:          xscreensaver-5.05-addopts.patch
+Patch21:         xscreensaver-5.05-webcollage-default-nonet.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -40,6 +40,7 @@
 %package base
 Summary:         A minimal installation of xscreensaver
 Group:           Amusements/Graphics
+BuildRequires:   autoconf
 BuildRequires:   bc
 BuildRequires:   desktop-file-utils
 BuildRequires:   gawk
@@ -172,7 +173,7 @@
 %setup -q -n %{name}-%{version}%{?beta_ver}
 
 %patch1 -p1 -b .sanitize-hacks
-%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .opts
 %patch21 -p1 -b .nonet
 
 change_option(){
@@ -281,14 +282,13 @@
 %endif
 
 %build
+autoconf
+
 archdir=`./config.guess`
 mkdir $archdir
 cd $archdir
 
 export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}"
-%if 0%{?fedora} >= 9
-export CFLAGS="$CFLAGS -Wno-overlength-strings"
-%endif
 
 CONFIG_OPTS="--prefix=%{_prefix} --with-pam --without-shadow --without-kerberos"
 CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks"
@@ -560,6 +560,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Mar  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-1
+- Update to 5.05
+
 * Sun Feb 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-5
 - Add -Wno-overlength-strings to shut up string length warning
 


--- xscreensaver-5.04-gcc43.patch DELETED ---


--- xscreensaver-5.04-webcollage-default-nonet.patch DELETED ---