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

[Mamoru Tasaka]

commit dc04996ffc8e6509fc89e8bc9b67dfbb6ec647cf
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Fri Jan 21 04:40:35 2011 +0900

    - Make webcollage work again (for newer gdk-pixbuf)

 xscreensaver-5.12-webcollage-ppm-gnome569671.patch |   11 +++++++++++
 xscreensaver.spec                                  |   12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/xscreensaver-5.12-webcollage-ppm-gnome569671.patch b/xscreensaver-5.12-webcollage-ppm-gnome569671.patch
new file mode 100644
index 0000000..7b5c3b5
--- /dev/null
+++ b/xscreensaver-5.12-webcollage-ppm-gnome569671.patch
@@ -0,0 +1,11 @@
+--- 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
+@@ -2709,7 +2709,7 @@
+ #
+ ##############################################################################
+ 
+-my $image_ppm   = sprintf ("%s/webcollage-%08x",
++my $image_ppm   = sprintf ("%s/webcollage-%08x.ppm",
+                            ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
+                            rand(0xFFFFFFFF));
+ my $image_tmp1  = sprintf ("%s/webcollage-1-%08x",
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 2cd124e..8461abc 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    10
+%define fedora_rel    11
 
 %undefine extrarel
 
@@ -61,7 +61,7 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 ## Patches which must be discussed with upstream
 #
-## Patch31, 32, 33, 34, 35, 36, 37, 38: already sent to the upstream
+## Patch31, 32, 33, 34, 35, 36, 37, 38, 39: already sent to the upstream
 #
 # For now set LANG to C for daemon because some garbage character appears
 # on passwd prompt
@@ -82,6 +82,10 @@ Patch36:         xscreensaver-5.12-warn-only-once-with-missing-image-dir.patch
 Patch37:         xscreensaver-5.12-wormhole-fpe.patch
 # Fix one-byte ahead access in apple2.c (may fix bug 666643)
 Patch38:         xscreensaver-5.12-apple2-1byte-ahead.patch
+# Make webcollage work again
+# Due to the change in https://bugzilla.gnome.org/show_bug.cgi?id=569671
+# gdk_pixbuf_new_from_file won't recognize ppm file without suffix in filename
+Patch39:         xscreensaver-5.12-webcollage-ppm-gnome569671.patch
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -278,6 +282,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch36 -p1 -b .warn_once
 %patch37 -p1 -b .wormhole
 %patch38 -p1 -b .apple2_byte
+%patch39 -p1 -b .webc.ppm
 
 change_option(){
    set +x
@@ -801,6 +806,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
+- Make webcollage work again (for newer gdk-pixbuf)
+
 * 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
   hack related files to -extras-base (bug 668427)