[xscreensaver/f17] Fix Patch36 a bit

[Mamoru Tasaka]

commit 6d35ee5ced0f64e6452b15765c6c1f6ccb50126f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Jun 13 00:22:57 2012 +0900

    Fix Patch36 a bit

 ...eensaver-5.15-feedurl-doubleslash-warning.patch |    5 +++--
 xscreensaver.spec                                  |    5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/xscreensaver-5.15-feedurl-doubleslash-warning.patch b/xscreensaver-5.15-feedurl-doubleslash-warning.patch
index 737aa05..fc61149 100644
--- a/xscreensaver-5.15-feedurl-doubleslash-warning.patch
+++ b/xscreensaver-5.15-feedurl-doubleslash-warning.patch
@@ -1,6 +1,6 @@
 --- 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-12 18:39:04.951825510 +0900
-@@ -1412,19 +1412,34 @@
++++ xscreensaver-5.15/driver/demo-Gtk.c	2012-06-13 00:10:00.0000000 +0900
+@@ -1412,19 +1412,35 @@
              {
                s0--;
                s += 3;
@@ -15,6 +15,7 @@
 +      else if (*s == '/' && !strncmp (s, "/./", 3)) {	/* delete "/./" */
 +        /* strcpy (s, s+2), s--; */
 +        memmove(s, s+2, strlen(s+1) + 1);
++        s--;
 +       }
        else if (*s == '/' && !strncmp (s, "/.\000", 3))	/* delete "/.$" */
          *s = 0, s--;
diff --git a/xscreensaver.spec b/xscreensaver.spec
index d7d2a9c..41c3eed 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    7
+%define fedora_rel    8
 
 %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-8
+- Fix Patch36 a bit
+
 * Tue Jun 12 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-7
 - xscreensaver-demo should not truncate http:// to http:/
   Also suppress warning for http:// on xscreensaver-demo