rpms/xscreensaver/F-9 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xscreensaver.spec, 1.76, 1.77 xscreensaver-5.05-addopts-jwz.patch, 1.1, NONE xscreensaver-5.07-hacks-fix.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore sources xscreensaver.spec 
Removed Files:
	xscreensaver-5.05-addopts-jwz.patch 
	xscreensaver-5.07-hacks-fix.patch 
Log Message:
* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-1
- Update to 5.08
- All non Fedora-specific patches went upstream
- Preserve all %release string for XScreenSaver.ad, util.h



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Sep 2008 16:22:19 -0000	1.10
+++ .cvsignore	28 Dec 2008 15:24:15 -0000	1.11
@@ -1,2 +1 @@
-xscreensaver-5.07.tar.gz
-ja.po.gz
+xscreensaver-5.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Sep 2008 16:22:19 -0000	1.10
+++ sources	28 Dec 2008 15:24:15 -0000	1.11
@@ -1,2 +1 @@
-55a12fcb5d3a7231c9850ef9d9f82918  xscreensaver-5.07.tar.gz
-43d35c0a54c80d16c6476d0b841bb92c  ja.po.gz
+79dea708c915341f205e00318a699be9  xscreensaver-5.08.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xscreensaver.spec	2 Dec 2008 06:32:13 -0000	1.76
+++ xscreensaver.spec	28 Dec 2008 15:24:15 -0000	1.77
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define mainversion   5.07
+%define mainversion   5.08
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -31,10 +31,8 @@
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
-Source20:        ja.po.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-Patch50:         xscreensaver-5.07-hacks-fix.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -187,9 +185,6 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .hacksfix
-
-gzip -dc %SOURCE20 > po/ja.po
 
 change_option(){
    set +x
@@ -254,7 +249,7 @@
 # record time, version
 eval sed -i.ver \
    -e \'s\|version \[45\]\.\[0-9a-z\]\[0-9a-z\]\*\|version %{version}-`echo \
-      %{release} | sed -e 's|\.[a-z][a-z0-9].*$||'`\|\' \
+      %{release} | sed -e '/IGNORE THIS/s|\.[a-z][a-z0-9].*$||'`\|\' \
       driver/XScreenSaver.ad.in
 
 eval sed -i.date \
@@ -266,7 +261,7 @@
       date -u +'%%d-%%b-%%Y'`\)\|g\' \
    -e \'s\|\\\(5.\[0-9\]\[0-9\]\\\)[a-z]\[0-9\]\[0-9\]\*\|\\\1\|\' \
    -e \'s\|5.\[0-9\]\[0-9\]\|%{version}-`echo %{release} | \
-      sed -e 's|\.[a-zA-Z][a-zA-Z0-9].*$||'`\|\' \
+      sed -e '/IGNORE THIS/s|\.[a-zA-Z][a-zA-Z0-9].*$||'`\|\' \
    utils/version.h
 
 # move man entry to 6x.
@@ -313,10 +308,10 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-#autoconf
+# autoconf
 
 archdir=`./config.guess`
-mkdir $archdir
+[ -d $archdir ] || mkdir $archdir
 cd $archdir
 
 export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}"
@@ -331,6 +326,7 @@
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
 
+unlink configure || :
 ln -s ../configure .
 %configure $CONFIG_OPTS
 rm -f configure
@@ -339,7 +335,7 @@
 ( cd po ; make generate_potfiles_in update-po )
 %endif
 
-make %{?_smp_mflags} \
+make %{?_smp_mflags} -k \
 	GMSGFMT="msgfmt --statistics"
 
 %if %{modular_conf}
@@ -633,6 +629,15 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-1
+- Update to 5.08
+- All non Fedora-specific patches went upstream
+- Preserve all %%release string for XScreenSaver.ad, util.h
+
+* Sat Dec 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-5
+- Apply gdk trial patch from jwz (slightly modified)
+- Fix warning on m6502.c
+
 * Fri Nov 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-4
 - Fix fireworkx segfault (bug 473355)
 


--- xscreensaver-5.05-addopts-jwz.patch DELETED ---


--- xscreensaver-5.07-hacks-fix.patch DELETED ---