[xscreensaver] Remove newline from xscreensaver-getimage-file result in webcollage to make -directory option work

[Mamoru Tasaka]

commit bc9fb425a509de1701af9a7020ed485e9c430e7f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Oct 3 23:39:25 2011 +0900

    Remove newline from xscreensaver-getimage-file result in webcollage
    to make -directory option work

 ...nsaver-5.15-webcollage-chomp-getimagefile.patch |   10 ++++++++++
 xscreensaver.spec                                  |   11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.15-webcollage-chomp-getimagefile.patch b/xscreensaver-5.15-webcollage-chomp-getimagefile.patch
new file mode 100644
index 0000000..61f8cb7
--- /dev/null
+++ b/xscreensaver-5.15-webcollage-chomp-getimagefile.patch
@@ -0,0 +1,10 @@
+--- xscreensaver-5.15/hacks/webcollage.debug	2011-07-10 20:39:24.000000000 +0900
++++ xscreensaver-5.15/hacks/webcollage	2011-10-03 12:42:54.238435337 +0900
+@@ -2343,6 +2343,7 @@
+ 
+   my $v = ($verbose_exec ? "-v" : "");
+   my $pick = `xscreensaver-getimage-file $v "$dir"`;
++  chomp($pick);
+   $pick = "$dir/$pick" unless ($pick =~ m@^/@s);       # relative path
+ 
+   LOG ($verbose_load, "picked file $pick ($id)");
diff --git a/xscreensaver.spec b/xscreensaver.spec
index b407b8b..5431639 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    1
+%define fedora_rel    2
 
 %undefine extrarel
 
@@ -60,9 +60,13 @@ Patch21:         xscreensaver-5.11-webcollage-default-nonet.patch
 Patch30:         xscreensaver-5.11-conf264.patch
 #
 ## Patches which must be discussed with upstream
+## Patch33: sent upstream
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
+# Remove newline of the output from xsreensaver-getimage-file in
+# webcollage
+Patch33:         xscreensaver-5.15-webcollage-chomp-getimagefile.patch
 #
 # driver/test-passwd tty segfaults
 Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
@@ -257,6 +261,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
+%patch33 -p1 -b .chomp
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
 
@@ -785,6 +790,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Oct  3 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-2
+- Remove newline from xscreensaver-getimage-file result in webcollage
+  to make -directory option work
+
 * Fri Sep 30 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-1
 - Update to 5.15