[xscreensaver/f17] Fix -verbose option usage in widwhacker as written in usage()

[Mamoru Tasaka]

commit c907e392601bea09f6b7ad41c5a937903d15adb8
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Jul 4 14:13:56 2012 +0900

    Fix -verbose option usage in widwhacker as written in usage()

 xscreensaver-5.18-vidwhacker-verbose-usage.patch |   11 +++++++++++
 xscreensaver.spec                                |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.18-vidwhacker-verbose-usage.patch b/xscreensaver-5.18-vidwhacker-verbose-usage.patch
new file mode 100644
index 0000000..1980798
--- /dev/null
+++ b/xscreensaver-5.18-vidwhacker-verbose-usage.patch
@@ -0,0 +1,11 @@
+--- xscreensaver-5.18/hacks/vidwhacker.verb	2012-04-24 10:40:31.000000000 +0900
++++ xscreensaver-5.18/hacks/vidwhacker	2012-07-04 12:36:12.934581448 +0900
+@@ -452,7 +452,7 @@
+ sub main() {
+   while ($_ = $ARGV[0]) {
+     shift @ARGV;
+-    if ($_ eq "--verbose") { $verbose++; }
++    if ($_ eq "-verbose") { $verbose++; }
+     elsif (m/^-v+$/) { $verbose += length($_)-1; }
+     elsif (m/^(-display|-disp|-dis|-dpy|-d)$/) { $ENV{DISPLAY} = shift @ARGV; }
+     elsif (m/^--?stdin$/) { $use_stdin = 1; }
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 54985a0..44666b8 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
 
@@ -65,6 +65,8 @@ Patch30:         xscreensaver-5.11-conf264.patch
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
 # Workaround to compile solar, need check later (perhaps)
 Patch33:         xscreensaver-5.18-sonar-compile.patch
+# Fix -verbose option usage as written in usage
+Patch34:         xscreensaver-5.18-vidwhacker-verbose-usage.patch
 # driver/test-passwd tty segfaults
 Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
@@ -262,6 +264,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
 %patch33 -p1 -b .compile
+%patch34 -p1 -b .verb
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
 %patch43 -p1 -b .hndl_extra
@@ -812,6 +815,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Jul  4 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.18-2
+- Fix -verbose option usage in widwhacker as written in usage()
+
 * Wed Jul  4 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.18-1
 - Update to 5.18