rpms/xscreensaver/F-8 xscreensaver-5.05-addopts.patch, NONE, 1.1 xscreensaver-5.05-webcollage-default-nonet.patch, NONE, 1.1 xscreensaver.spec, 1.60, 1.61 xscreensaver-5.04-webcollage-default-nonet.patch, 1.1, NONE

Mamoru Tasaka (mtasaka) fedora-extras-commits at redhat.com
Sun Mar 2 14:17:28 UTC 2008


Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.05-addopts.patch 
	xscreensaver-5.05-webcollage-default-nonet.patch 
Removed Files:
	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/F-8/xscreensaver.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xscreensaver.spec	13 Nov 2007 10:49:59 -0000	1.60
+++ xscreensaver.spec	2 Mar 2008 14:16:50 -0000	1.61
@@ -1,22 +1,15 @@
 %define name          xscreensaver
 
-%define version       5.04
+%define version       5.05
 %define beta_ver      %{nil}
-%if 0%{?fedora} <= 6
-%define modular_conf  0
-%define fedora_rel    1.12
-%else
+
+
 %define modular_conf  1
 %define fedora_rel    1
-%endif
 
 %define extrarel      %{nil}
 
-%if 0%{?fedora} >= 7
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
-%else
-%define default_text  %{_datadir}/doc/eula.en_US
-%endif
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -38,7 +31,8 @@
 Source10:        update-xscreensaver-hacks
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.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}
@@ -46,6 +40,7 @@
 %package base
 Summary:         A minimal installation of xscreensaver
 Group:           Amusements/Graphics
+BuildRequires:   autoconf
 BuildRequires:   bc
 BuildRequires:   desktop-file-utils
 BuildRequires:   gawk
@@ -67,16 +62,10 @@
 BuildRequires:   gtk2-devel	
 BuildRequires:   libjpeg-devel
 BuildRequires:   libglade2-devel
-%if 0%{?fedora} >= 7
 BuildRequires:   fedora-release-notes
-%else
-BuildRequires:   fedora-release
-%endif
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
-%if 0%{?fedora} >= 7
 Requires:        xdg-utils
-%endif
 Requires:        xorg-x11-resutils
 Requires:        xorg-x11-fonts-ISO8859-1-100dpi
 
@@ -184,6 +173,7 @@
 %setup -q -n %{name}-%{version}%{?beta_ver}
 
 %patch1 -p1 -b .sanitize-hacks
+%patch3 -p1 -b .opts
 %patch21 -p1 -b .nonet
 
 change_option(){
@@ -285,7 +275,15 @@
    cp -p %{_datadir}/libtool/config.{sub,guess} .
 fi
 
+# fix for desktop-file-utils 0.14+
+%if 0%{?fedora} >= 9
+sed -i.icon -e 's|xscreensaver\.xpm|xscreensaver|' \
+   driver/screensaver-properties.desktop.in
+%endif
+
 %build
+autoconf
+
 archdir=`./config.guess`
 mkdir $archdir
 cd $archdir
@@ -297,11 +295,7 @@
 CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}"
 CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
 CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd"
-%if 0%{?fedora} >= 7
 CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
-%else
-CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview"
-%endif
 
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -356,7 +350,7 @@
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category    DesktopSettings                     \
-%if 0%{?fedora} <= 7
+%if 0
    --add-category X-Red-Hat-Base                         \
 %else
    --remove-category Appearance                          \
@@ -566,6 +560,22 @@
 %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
+
+* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-4
+- Add patch to xscreensaver be happy with gcc43
+- Rebuild against gcc43
+
+* Fri Dec  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-3
+- Fix desktop icon name for desktop-file-utils 0.14+ on F-9+
+
+* Fri Nov 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-2
+- Rebuild against fixed mesa for F-9 (bug 380141)
+
 * Tue Nov 13 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.04-1
 - Update to 5.04
 


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




More information about the fedora-extras-commits mailing list