rpms/xscreensaver/devel xscreensaver-5.09-hacks-missing-header-creation.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xscreensaver.spec, 1.95, 1.96 xscreensaver-5.08-gcc441-aliasing.patch, 1.1, NONE xscreensaver-5.08-new-xextproto.patch, 1.1, NONE xscreensaver-5.08-phosphor-segv.patch, 1.1, NONE xscreensaver-5.08-po-recreate.patch, 1.3, NONE xscreensaver-5.08-randr-ncrtc-from-gentoo.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-5.09-hacks-missing-header-creation.patch 
Removed Files:
	xscreensaver-5.08-gcc441-aliasing.patch 
	xscreensaver-5.08-new-xextproto.patch 
	xscreensaver-5.08-phosphor-segv.patch 
	xscreensaver-5.08-po-recreate.patch 
	xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
Log Message:
* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
- Update to 5.09
- Drop patches applied by upstream (1 patch still pending on upstream
  + 2 Fedora specific patches left)
- Add one patch to generate missing header files


xscreensaver-5.09-hacks-missing-header-creation.patch:
 Makefile.in     |    3 +++
 glx/Makefile.in |    4 ++++
 2 files changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.09-hacks-missing-header-creation.patch ---
--- xscreensaver-5.09/hacks/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/Makefile.in	2009-09-03 22:35:42.000000000 +0900
@@ -825,6 +825,9 @@
 	UTILS_SRC="$(UTILS_SRC)" \
 	$(srcdir)/m6502.sh m6502.h $(srcdir)/images/m6502/*.asm
 
+# Compiling m6502.c needs m6502.h
+m6502.o:	m6502.h
+
 m6502:		m6502.o		asm6502.o $(HACK_OBJS) $(ATV)
 	$(CC_HACK) -o $@ $@.o	asm6502.o $(HACK_OBJS) $(ATV) $(HACK_LIBS)
 
--- xscreensaver-5.09/hacks/glx/Makefile.in.debug	2009-09-03 21:25:00.000000000 +0900
+++ xscreensaver-5.09/hacks/glx/Makefile.in	2009-09-03 22:43:26.000000000 +0900
@@ -670,6 +670,10 @@
 	$(srcdir)/molecules.sh molecules.h $(HACK_SRC)/images/molecules/*.pdb
 
 MOLECULE_OBJS=sphere.o tube.o $(HACK_TRACK_OBJS)
+
+# Compiling molecule.c needs molecules.h
+molecule.o:	molecules.h
+
 molecule:	molecule.o	$(MOLECULE_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(MOLECULE_OBJS) $(HACK_LIBS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Dec 2008 15:24:15 -0000	1.11
+++ .cvsignore	3 Sep 2009 14:10:33 -0000	1.12
@@ -1 +1 @@
-xscreensaver-5.08.tar.gz
+xscreensaver-5.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Dec 2008 15:24:15 -0000	1.11
+++ sources	3 Sep 2009 14:10:33 -0000	1.12
@@ -1 +1 @@
-79dea708c915341f205e00318a699be9  xscreensaver-5.08.tar.gz
+f4d5070eb9f240f4d812f1c80cc32213  xscreensaver-5.09.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- xscreensaver.spec	28 Aug 2009 19:36:20 -0000	1.95
+++ xscreensaver.spec	3 Sep 2009 14:10:34 -0000	1.96
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define mainversion   5.08
+%define mainversion   5.09
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    13
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -45,29 +45,14 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
-# Reported from upstream, sent upstream
-# pot file is not regenerated correctly
-Patch50:         xscreensaver-5.08-po-recreate.patch
-# bug 481146, sent upstream
-# phosphor crashes when resizing window
-Patch51:         xscreensaver-5.08-phosphor-segv.patch
-# bug 504912, sent upstream
-# ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
-# xscreensaver crashes when randr reportes 0 rroi->ncrtc
-Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
-%if 0%{?fedora} >= 12
-# Fix for Xext 1.0.99.3
-# http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
-Patch53:         xscreensaver-5.08-new-xextproto.patch
-# Fix warnings for breaking strict aliasing rule
-Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
-%endif
-# Ubuntu bug 418419, must send to upstream later
+# Generate missing header files
+Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
+# Ubuntu bug 418419, sent upstream
 # Another SIGFPE when hack's window size is too small:
 Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
-# Not sent to upstream yet, must do later
 #
+# Not sent to upstream yet, must do later
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -222,13 +207,7 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch50 -p1 -b .po
-%patch51 -p1 -b .phosphor
-%patch52 -p0 -b .randr_ncrtc
-%if 0%{?fedora} >= 12
-%patch53 -p1 -b .newxextproto
-%patch54 -p1 -b .aliasing
-%endif
+%patch50 -p1 -b .missing
 %patch55 -p1 -b .small
 
 change_option(){
@@ -355,7 +334,7 @@ sed -i.delay -e 's| delay = 1| delay = 3
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+#autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -694,6 +673,12 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.09-1
+- Update to 5.09
+- Drop patches applied by upstream (1 patch still pending on upstream
+  + 2 Fedora specific patches left)
+- Add one patch to generate missing header files
+
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small
   (Ubuntu bug 418419)


--- xscreensaver-5.08-gcc441-aliasing.patch DELETED ---


--- xscreensaver-5.08-new-xextproto.patch DELETED ---


--- xscreensaver-5.08-phosphor-segv.patch DELETED ---


--- xscreensaver-5.08-po-recreate.patch DELETED ---


--- xscreensaver-5.08-randr-ncrtc-from-gentoo.patch DELETED ---