[xscreensaver] - Make webcollage work again (for newer gdk-pixbuf) - Fix vidwhacker also

[Mamoru Tasaka]

commit ea39e156bf3fdcb28791bd625d6ba6c745cadace
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Fri Jan 21 07:20:12 2011 +0900

    - Make webcollage work again (for newer gdk-pixbuf)
    - Fix vidwhacker also

 xscreensaver-5.12-webcollage-ppm-gnome569671.patch |   13 ++++++++++++-
 xscreensaver.spec                                  |    5 +++--
 2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/xscreensaver-5.12-webcollage-ppm-gnome569671.patch b/xscreensaver-5.12-webcollage-ppm-gnome569671.patch
index 7b5c3b5..db26c21 100644
--- a/xscreensaver-5.12-webcollage-ppm-gnome569671.patch
+++ b/xscreensaver-5.12-webcollage-ppm-gnome569671.patch
@@ -1,5 +1,16 @@
+--- xscreensaver-5.12/hacks/vidwhacker.debug	2007-07-11 03:27:56.000000000 +0900
++++ xscreensaver-5.12/hacks/vidwhacker	2011-01-21 07:06:13.000000000 +0900
+@@ -378,7 +378,7 @@
+   } else {
+     my $tmpdir = $ENV{TMPDIR};
+     $tmpdir = "/tmp" unless $tmpdir;
+-    my $fn =  sprintf ("%s/vidwhacker-%08x", $tmpdir, rand(0xFFFFFFFF));
++    my $fn =  sprintf ("%s/vidwhacker-%08x.ppm", $tmpdir, rand(0xFFFFFFFF));
+     local *OUT;
+     unlink $fn;
+     push @all_tmpfiles, $fn;
 --- xscreensaver-5.12/hacks/webcollage.debug	2009-10-14 06:19:36.000000000 +0900
-+++ xscreensaver-5.12/hacks/webcollage	2011-01-21 03:10:55.000000000 +0900
++++ xscreensaver-5.12/hacks/webcollage	2011-01-21 07:08:39.000000000 +0900
 @@ -2709,7 +2709,7 @@
  #
  ##############################################################################
diff --git a/xscreensaver.spec b/xscreensaver.spec
index f7d4716..88b4254 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    11.1
+%define fedora_rel    12
 
 %undefine extrarel
 
@@ -810,8 +810,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
-* Fri Jan 21 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-11
+* Fri Jan 21 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-12
 - Make webcollage work again (for newer gdk-pixbuf)
+- Fix vidwhacker also
 
 * Tue Jan 11 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-10
 - From F-14+ (not for F-13), kill perl dependency on -base, move