[xscreensaver/f17] And again fix Patch36 a bit...

[Mamoru Tasaka]

commit 2c6a037cf2c806f83240da18daced3bc5b279dc1
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Jun 13 20:38:22 2012 +0900

    And again fix Patch36 a bit...

 ...eensaver-5.15-feedurl-doubleslash-warning.patch |    4 ++--
 xscreensaver.spec                                  |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/xscreensaver-5.15-feedurl-doubleslash-warning.patch b/xscreensaver-5.15-feedurl-doubleslash-warning.patch
index fc61149..890d88e 100644
--- a/xscreensaver-5.15-feedurl-doubleslash-warning.patch
+++ b/xscreensaver-5.15-feedurl-doubleslash-warning.patch
@@ -1,5 +1,5 @@
 --- xscreensaver-5.15/driver/demo-Gtk.c.feedurl	2011-05-15 11:38:09.000000000 +0900
-+++ xscreensaver-5.15/driver/demo-Gtk.c	2012-06-13 00:10:00.0000000 +0900
++++ xscreensaver-5.15/driver/demo-Gtk.c	2012-06-13 20:25:00.0000000 +0900
 @@ -1412,19 +1412,35 @@
              {
                s0--;
@@ -14,7 +14,7 @@
 -        strcpy (s, s+2), s--;
 +      else if (*s == '/' && !strncmp (s, "/./", 3)) {	/* delete "/./" */
 +        /* strcpy (s, s+2), s--; */
-+        memmove(s, s+2, strlen(s+1) + 1);
++        memmove(s, s+2, strlen(s+2) + 1);
 +        s--;
 +       }
        else if (*s == '/' && !strncmp (s, "/.\000", 3))	/* delete "/.$" */
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 41c3eed..0ceaa8c 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    8
+%define fedora_rel    9
 
 %undefine extrarel
 
@@ -802,6 +802,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Jun 13 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-9
+- And again fix Patch36 a bit...
+
 * Wed Jun 13 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-8
 - Fix Patch36 a bit