[xscreensaver] Update to 5.18

[Mamoru Tasaka]

commit 88b852d368c4c5ec8b798913e4856e9aed9ed936
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Jul 4 09:41:24 2012 +0900

    Update to 5.18

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...er-5.13-add-setting-dpmsQuickoff-from-jwz.patch |  328 --------------------
 xscreensaver-5.17-blurb-in-sighandler-jwz.patch    |   81 -----
 xscreensaver-5.18-sonar-compile.patch              |   12 +
 xscreensaver.spec                                  |   22 +-
 6 files changed, 24 insertions(+), 422 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 736c123..b95e5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /xscreensaver-5.15.tar.gz
 /xscreensaver-5.16.tar.gz
 /xscreensaver-5.17.tar.gz
+/xscreensaver-5.18.tar.gz
diff --git a/sources b/sources
index d9e34bd..07dfc84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22083b77d15334f1eb127603b9a35b5a  xscreensaver-5.17.tar.gz
+92eccee4bf6cd8bc6c0de98c1b3107fa  xscreensaver-5.18.tar.gz
diff --git a/xscreensaver-5.18-sonar-compile.patch b/xscreensaver-5.18-sonar-compile.patch
new file mode 100644
index 0000000..e0adde0
--- /dev/null
+++ b/xscreensaver-5.18-sonar-compile.patch
@@ -0,0 +1,12 @@
+--- xscreensaver-5.18/hacks/glx/sonar-icmp.c.compile	2012-07-03 04:18:53.000000000 +0900
++++ xscreensaver-5.18/hacks/glx/sonar-icmp.c	2012-07-04 09:17:12.580996448 +0900
+@@ -591,7 +591,9 @@
+                 fprintf (stderr, "%s:     if: %4s: %s\n", progname,
+                          ifa->ifa_name,
+                          (ifa->ifa_addr->sa_family == AF_UNIX  ? "local" :
++#ifdef AF_LINK
+                           ifa->ifa_addr->sa_family == AF_LINK  ? "link"  :
++#endif
+                           ifa->ifa_addr->sa_family == AF_INET6 ? "ipv6"  :
+                           "other"));
+               continue;
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 7985080..54985a0 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.17
+%define mainversion   5.18
 %define beta_ver      %{nil}
 
 
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    2
+%define fedora_rel    1
 
 %undefine extrarel
 
@@ -63,16 +63,14 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
-# lament now uses a larger xpm file
-Patch33:         xscreensaver-5.17-lament-newxpm.patch
-# Don't call ctime() in signal handler, patch from jwz
-Patch34:         xscreensaver-5.17-blurb-in-sighandler-jwz.patch
-#
+# Workaround to compile solar, need check later (perhaps)
+Patch33:         xscreensaver-5.18-sonar-compile.patch
 # driver/test-passwd tty segfaults
 Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
 Patch42:         xscreensaver-5.12-tests-miscfix.patch
-# patch to compile driver/test-passwd.c with Patch34
+# patch to compile driver/test-passwd.c with
+# xscreensaver-5.17-2 and above
 Patch43:         xscreensaver-5.17-blurb-hndl-test-passwd.patch
 # 
 # Patches end
@@ -263,10 +261,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
-%patch33 -p1 -b .newxpm
-( cd driver
-%patch34 -p0 -b .blurb_hndl
-)
+%patch33 -p1 -b .compile
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
 %patch43 -p1 -b .hndl_extra
@@ -817,6 +812,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Jul  4 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.18-1
+- Update to 5.18
+
 * Sat Jun 30 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.17-2
 - Don't call ctime in blurb in signal hander, patch by jwz