[xscreensaver] Update to 5.26

[Mamoru TASAKA]

commit 4d0a805976b8399a2c93628d079b0bbf5f49e7d5
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Tue Dec 10 13:58:57 2013 +0900

    Update to 5.26

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 xscreensaver-5.11-conf264.patch                    |   24 --------------------
 ...screensaver-5.26-webcollage-default-nonet.patch |   14 +++++-----
 xscreensaver.spec                                  |   14 +++++-----
 5 files changed, 16 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f2260b..186ca0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ clog
 /xscreensaver-5.21.tar.gz
 /xscreensaver-5.22.tar.gz
 /xscreensaver-5.23.tar.gz
+/xscreensaver-5.26.tar.gz
diff --git a/sources b/sources
index ca01b61..95e4c63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da1fa6978520fc45b87155480ab222c9  xscreensaver-5.23.tar.gz
+dd4390f36b9c9d79b66d18b145ca62ad  xscreensaver-5.26.tar.gz
diff --git a/xscreensaver-5.16-webcollage-default-nonet.patch b/xscreensaver-5.26-webcollage-default-nonet.patch
similarity index 73%
rename from xscreensaver-5.16-webcollage-default-nonet.patch
rename to xscreensaver-5.26-webcollage-default-nonet.patch
index 719f26a..7f6edfd 100644
--- a/xscreensaver-5.16-webcollage-default-nonet.patch
+++ b/xscreensaver-5.26-webcollage-default-nonet.patch
@@ -1,5 +1,5 @@
---- xscreensaver-5.16/hacks/config/webcollage.xml.nonet	2012-06-19 16:14:11.000000000 +0900
-+++ xscreensaver-5.16/hacks/config/webcollage.xml	2012-06-21 00:07:11.000000000 +0900
+--- xscreensaver-5.26/hacks/config/webcollage.xml.nonet	2013-12-05 07:04:09.000000000 +0900
++++ xscreensaver-5.26/hacks/config/webcollage.xml	2013-12-10 13:41:37.303883653 +0900
 @@ -28,8 +28,8 @@
    <string id="filter"  _label="Per-image filter program" arg="-filter %"/>
    <string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
@@ -8,9 +8,9 @@
   -->
 +  <file id="dir" _label="Image directory" arg="-directory %"/>
  
-   <_description>
- This is what the Internet looks like.
-@@ -47,6 +47,11 @@
+   <xscreensaver-updater />
+ 
+@@ -49,6 +49,11 @@
  
  See also http://www.jwz.org/webcollage/
  
@@ -22,8 +22,8 @@
  Written by Jamie Zawinski; 1999.
    </_description>
  </screensaver>
---- xscreensaver-5.16/hacks/webcollage.man.nonet	2009-10-14 06:12:31.000000000 +0900
-+++ xscreensaver-5.16/hacks/webcollage.man	2012-06-21 00:04:50.000000000 +0900
+--- xscreensaver-5.26/hacks/webcollage.man.nonet	2009-10-14 06:12:31.000000000 +0900
++++ xscreensaver-5.26/hacks/webcollage.man	2013-12-10 13:40:38.139050305 +0900
 @@ -178,6 +178,11 @@
  .TP 8
  .B \-fps
diff --git a/xscreensaver.spec b/xscreensaver.spec
index c295a08..ecedf27 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.23
+%define mainversion   5.26
 %define beta_ver      %{nil}
 
 
@@ -55,12 +55,9 @@ Source12:        xscreensaver-autostart.desktop
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 # Change webcollage not to access to net
 # Also see bug 472061
-Patch21:         xscreensaver-5.16-webcollage-default-nonet.patch
+Patch21:         xscreensaver-5.26-webcollage-default-nonet.patch
 #
 ## Patches already sent to the upsteam
-# Remove "AC_PROG_CC' was expanded before it was required" warning
-Patch30:         xscreensaver-5.11-conf264.patch
-#
 ## Patches which must be discussed with upstream
 #
 # Update Japanese po file
@@ -409,7 +406,7 @@ autoheader
 
 %build
 
-archdir=`./config.guess`
+archdir=`sh ./config.guess`
 [ -d $archdir ] || mkdir $archdir
 cd $archdir
 
@@ -510,7 +507,7 @@ make tests -C driver
 %endif
 
 %install
-archdir=`./config.guess`
+archdir=`sh ./config.guess`
 cd $archdir
 
 rm -rf ${RPM_BUILD_ROOT}
@@ -850,6 +847,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Dec 10 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.26-1
+- Update to 5.26
+
 * Wed Nov 13 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.23-1
 - Update to 5.23