rpms/xscreensaver/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xscreensaver.spec, 1.79, 1.80 xscreensaver-5.07-gdk-exif-jwz-modified.patch, 1.1, NONE xscreensaver-5.07-hacks-fix.patch, 1.1, NONE xscreensaver-5.07-hacks-fix2.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore sources xscreensaver.spec 
Removed Files:
	xscreensaver-5.07-gdk-exif-jwz-modified.patch 
	xscreensaver-5.07-hacks-fix.patch 
	xscreensaver-5.07-hacks-fix2.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/devel/.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/devel/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/devel/xscreensaver.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xscreensaver.spec	27 Dec 2008 18:03:10 -0000	1.79
+++ xscreensaver.spec	28 Dec 2008 15:24:15 -0000	1.80
@@ -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    5
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -31,12 +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
-Patch51:         xscreensaver-5.07-hacks-fix2.patch
-Patch100:        xscreensaver-5.07-gdk-exif-jwz-modified.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -189,11 +185,6 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .hacksfix
-%patch51 -p1 -b .hacksfix2
-%patch100 -p1 -b .gdk
-
-gzip -dc %SOURCE20 > po/ja.po
 
 change_option(){
    set +x
@@ -258,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 \
@@ -270,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.
@@ -317,7 +308,7 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+# autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -344,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}
@@ -638,6 +629,11 @@
 %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


--- xscreensaver-5.07-gdk-exif-jwz-modified.patch DELETED ---


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


--- xscreensaver-5.07-hacks-fix2.patch DELETED ---