Mon Apr 12 14:58:42 UTC 2010

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv400/F-13

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.11-conf264.patch 
	xscreensaver-5.11-usepo_again.patch 
	xscreensaver-5.11-webcollage-default-nonet.patch 
Removed Files:
	xscreensaver-5.07-webcollage-default-nonet.patch 
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver-5.10-apple2-memleak.patch 
	xscreensaver-5.10-noseguy-segv-with-nofont.patch 
	xscreensaver-5.10-substrate-bz545847.patch 
Log Message:
* Mon Apr 12 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-1
- Update to 5.11
- All patches sent to the upstream now applied in the tarball
- 2 new patches, one for autoconf, one for po
- Preserve 5.10 tarball for now for translation


xscreensaver-5.11-conf264.patch:
 Makefile.in  |    4 ++--
 configure.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xscreensaver-5.11-conf264.patch ---
--- xscreensaver-5.11/Makefile.in.debug	2010-04-12 13:49:19.000000000 +0900
+++ xscreensaver-5.11/Makefile.in	2010-04-12 20:36:05.000000000 +0900
@@ -99,8 +99,8 @@
 # or later, feel free.  Personally, I can't be bothered.
 #
 configure::
-	autoconf263
-	autoheader263
+	autoconf
+	autoheader
 	@TMP=configure.$$$$ ;						     \
 	echo "munging configure's --help message..." ;			     \
 	( perl -e '							     \
--- xscreensaver-5.11/configure.in.debug	2010-01-02 20:28:15.000000000 +0900
+++ xscreensaver-5.11/configure.in	2010-04-12 20:40:46.000000000 +0900
@@ -315,7 +315,7 @@
 ###############################################################################
 
 AC_DEFUN(AC_PROG_CC_ANSI,
- [AC_PROG_CC
+ [AC_REQUIRE([AC_PROG_CC])
 
   if test -z "$GCC"; then
     # not using GCC

xscreensaver-5.11-usepo_again.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xscreensaver-5.11-usepo_again.patch ---
--- xscreensaver-5.11/Makefile.in.po	2010-04-12 20:36:05.000000000 +0900
+++ xscreensaver-5.11/Makefile.in	2010-04-12 20:51:44.000000000 +0900
@@ -6,8 +6,8 @@
 VPATH		= @srcdir@
 
 SHELL		= /bin/sh
-#SUBDIRS	= utils driver hacks hacks/glx po
-SUBDIRS		= utils driver hacks hacks/glx
+SUBDIRS	= utils driver hacks hacks/glx po
+#SUBDIRS		= utils driver hacks hacks/glx
 SUBDIRS2	= $(SUBDIRS) OSX
 TARFILES	= README README.hacking README.VMS INSTALL \
 		  configure configure.in Makefile.in config.h.in \

xscreensaver-5.11-webcollage-default-nonet.patch:
 config/webcollage.xml |    7 ++++++-
 webcollage.man        |    5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE xscreensaver-5.11-webcollage-default-nonet.patch ---
--- xscreensaver-5.11/hacks/config/webcollage.xml.nonet	2008-08-04 04:23:41.000000000 +0900
+++ xscreensaver-5.11/hacks/config/webcollage.xml	2010-04-12 20:25:26.000000000 +0900
@@ -28,8 +28,8 @@
   <string id="filter"  _label="Per-image filter program" arg="-filter %"/>
   <string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
   <file id="dictionary" _label="Dictionary file" arg="-dictionary %"/>
-  <file id="dir" _label="Image directory" arg="-directory %"/>
  -->
+  <file id="dir" _label="Image directory" arg="-directory %"/>
 
   <_description>
 This makes collages out of random images pulled off of the
@@ -44,6 +44,11 @@
 
 See also http://www.jwz.org/webcollage/
 
+NOTE:
+Webcollage on Fedora does not connect to internet by default
+and uses image files on your local disk. If you want webcollage to
+search for image files on net, use webcollage.original .
+
 Written by Jamie Zawinski; 1999.
   </_description>
 </screensaver>
--- xscreensaver-5.11/hacks/webcollage.man.nonet	2009-10-14 06:12:31.000000000 +0900
+++ xscreensaver-5.11/hacks/webcollage.man	2010-04-12 20:29:34.000000000 +0900
@@ -178,6 +178,11 @@
 .TP 8
 .B \-fps
 Display the current frame rate and CPU load (MacOS only).
+.SH NOTES FOR FEDORA USER
+Webcollage on Fedora uses '-directory' option by default, so it
+.B does not connect to internet 
+and uses image files on your local disk. If you want webcollage to
+search for image files on net, use webcollage.original .
 .SH ENVIRONMENT
 .PP
 .TP 8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	8 Sep 2009 05:41:04 -0000	1.13
+++ .cvsignore	12 Apr 2010 14:58:38 -0000	1.14
@@ -1 +1,2 @@
 xscreensaver-5.10.tar.gz
+xscreensaver-5.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	8 Sep 2009 05:41:04 -0000	1.13
+++ sources	12 Apr 2010 14:58:38 -0000	1.14
@@ -1 +1,2 @@
 0d7205f9da8e3f1b83bcda549d73a7c4  xscreensaver-5.10.tar.gz
+86cb9d36fd62bba479d1cf45b35457fe  xscreensaver-5.11.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/xscreensaver.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- xscreensaver.spec	5 Feb 2010 16:51:24 -0000	1.105
+++ xscreensaver.spec	12 Apr 2010 14:58:41 -0000	1.106
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define mainversion   5.10
+%define mainversion   5.11
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    6.1
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -33,6 +33,8 @@ License:         MIT
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz
+# Translation being removed?? Recovering from the previous version
+Source1:         http://www.jwz.org/xscreensaver/xscreensaver-5.10.tar.gz
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
@@ -40,21 +42,22 @@ Source10:        update-xscreensaver-hac
 Source11:        xscreensaver-autostart
 Source12:        xscreensaver-autostart.desktop
 %endif
+##
+## Patches
+##
 # bug 129335
 # sanitize the names of modes in barcode
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 # Change webcollage not to access to net
 # Also see bug 472061
-Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-#
-# Patches already sent to upstream:
-Patch30:         xscreensaver-5.10-substrate-bz545847.patch
-Patch31:         xscreensaver-5.10-apple2-initialization.patch
-# Not sent to upstream yet, must do later
-# bug 560614
-Patch32:         xscreensaver-5.10-noseguy-segv-with-nofont.patch
-Patch33:         xscreensaver-5.10-apple2-memleak.patch
+Patch21:         xscreensaver-5.11-webcollage-default-nonet.patch
+# Reuse po again
+Patch22:         xscreensaver-5.11-usepo_again.patch
 #
+## Patches to be sent to the upsteam
+# Remove "AC_PROG_CC' was expanded before it was required" warning
+Patch30:         xscreensaver-5.11-conf264.patch
+# 
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -85,7 +88,9 @@ BuildRequires:   libXxf86vm-devel
 BuildRequires:   gtk2-devel	
 BuildRequires:   libjpeg-devel
 BuildRequires:   libglade2-devel
+%if 0%{?fedora}
 BuildRequires:   fedora-release-notes
+%endif
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xdg-utils
@@ -204,14 +209,13 @@ This package contains some test programs
 
 
 %prep
-%setup -q -n %{name}-%{mainversion}%{?beta_ver}
+%setup -q -n %{name}-%{mainversion}%{?beta_ver} -a 1
+ln -sf xscreensaver-5.10/po po
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch30 -p1 -b .subst
-%patch31 -p1 -b .apple
-%patch32 -p1 -b .noseguy
-%patch33 -p1 -b .meml
+%patch22 -p1 -b .po
+%patch30 -p1 -b .conf264
 
 change_option(){
    set +x
@@ -269,7 +273,7 @@ change_option driver/XScreenSaver.ad.in 
    splash=False \
    ignoreUninstalledPrograms=True \
    textProgram=fortune\ -s \
-%if %{?fedora} >= 12
+%if 0%{?fedora} >= 12
    textURL=%{default_URL}
 %endif
 
@@ -339,8 +343,10 @@ sed -i.delay -e 's| delay = 1| delay = 3
 # test-grab: testing time too long, setting time 15 min -> 20 sec
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
+autoconf
+autoheader
+
 %build
-#autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -681,6 +687,15 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Apr 12 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-1
+- Update to 5.11
+- All patches sent to the upstream now applied in the tarball
+- 2 new patches, one for autoconf, one for po
+- Preserve 5.10 tarball for now for translation
+
+* Sat Feb 27 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-12: rebuild with newer gcc
+
 * Fri Feb  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-6.1
 - A bit more memleak fix
 


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


--- xscreensaver-5.10-apple2-initialization.patch DELETED ---


--- xscreensaver-5.10-apple2-memleak.patch DELETED ---


--- xscreensaver-5.10-noseguy-segv-with-nofont.patch DELETED ---


--- xscreensaver-5.10-substrate-bz545847.patch DELETED ---

