[xscreensaver/f16] Make vidwhacker work correctly when xscreensaver-getimage-file returns relative path (bug 746847)
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue Oct 18 14:53:44 UTC 2011
commit b7e445776042abd7bd008f5413c1e6aae18c1ff9
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Tue Oct 18 23:53:40 2011 +0900
Make vidwhacker work correctly when xscreensaver-getimage-file
returns relative path (bug 746847)
...nsaver-5.15-vidwhacker-with-relative-path.patch | 10 ++++++++++
xscreensaver.spec | 10 +++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.15-vidwhacker-with-relative-path.patch b/xscreensaver-5.15-vidwhacker-with-relative-path.patch
new file mode 100644
index 0000000..2dd57a4
--- /dev/null
+++ b/xscreensaver-5.15-vidwhacker-with-relative-path.patch
@@ -0,0 +1,10 @@
+--- xscreensaver-5.15/hacks/vidwhacker.debug 2011-01-25 20:07:47.000000000 +0900
++++ xscreensaver-5.15/hacks/vidwhacker 2011-10-18 12:50:44.516561529 +0900
+@@ -326,6 +326,7 @@
+ my $fn = `$cmd`;
+ $fn =~ s/\n$//s;
+ error ("didn't get a file?") if ($fn eq "");
++ $fn = "$imagedir/$fn" unless ($fn =~ m@^/@s); # relative path
+
+ print STDERR "$progname: selected file $fn\n" if ($verbose > 1);
+
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 5431639..43868cc 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 2
+%define fedora_rel 3
%undefine extrarel
@@ -67,6 +67,9 @@ 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
+# Make vidwhacker work correctly when xscreensaver-getimage-file
+# returns relative path (bug 746847)
+Patch34: xscreensaver-5.15-vidwhacker-with-relative-path.patch
#
# driver/test-passwd tty segfaults
Patch41: xscreensaver-5.12-test-passwd-segv-tty.patch
@@ -262,6 +265,7 @@ This package contains some test programs to debug XScreenSaver.
%patch21 -p1 -b .nonet
%patch32 -p1 -b .dpmsoff_japo
%patch33 -p1 -b .chomp
+%patch34 -p1 -b .relative
%patch41 -p1 -b .test_passwd
%patch42 -p1 -b .test_misc
@@ -790,6 +794,10 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Tue Oct 18 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-3
+- Make vidwhacker work correctly when xscreensaver-getimage-file
+ returns relative path (bug 746847)
+
* 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
More information about the scm-commits
mailing list