[xscreensaver/f16] Update to 5.17

[Mamoru Tasaka]

commit 8bd8c69b5f24a073c8440e2370c059718d7c2c7e
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat Jun 23 14:06:17 2012 +0900

    Update to 5.17

 .gitignore                            |    1 +
 sources                               |    2 +-
 xscreensaver-5.16-ptylink.patch       |   62 ---------------------------------
 xscreensaver-5.17-lament-newxpm.patch |   13 +++++++
 xscreensaver.spec                     |   11 ++++--
 5 files changed, 22 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b44db9..736c123 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ clog
 /xscreensaver-5.14.tar.gz
 /xscreensaver-5.15.tar.gz
 /xscreensaver-5.16.tar.gz
+/xscreensaver-5.17.tar.gz
diff --git a/sources b/sources
index 18d6a4a..d9e34bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d459220586637c09e5507f52f2e334a  xscreensaver-5.16.tar.gz
+22083b77d15334f1eb127603b9a35b5a  xscreensaver-5.17.tar.gz
diff --git a/xscreensaver-5.17-lament-newxpm.patch b/xscreensaver-5.17-lament-newxpm.patch
new file mode 100644
index 0000000..6799da7
--- /dev/null
+++ b/xscreensaver-5.17-lament-newxpm.patch
@@ -0,0 +1,13 @@
+--- xscreensaver-5.17/hacks/glx/Makefile.in.newxpm	2012-06-23 13:23:12.000000000 +0900
++++ xscreensaver-5.17/hacks/glx/Makefile.in	2012-06-23 13:35:52.000000000 +0900
+@@ -1832,7 +1832,9 @@
+ lament.o: ../../config.h
+ lament.o: $(HACK_SRC)/fps.h
+ lament.o: $(srcdir)/gltrackball.h
+-lament.o: $(HACK_SRC)/images/lament.xpm
++#lament.o: $(HACK_SRC)/images/lament.xpm
++#lament.o: $(HACK_SRC)/images/lament128.xpm
++lament.o: $(HACK_SRC)/images/lament512.xpm
+ lament.o: $(srcdir)/jwzgles.h
+ lament.o: $(srcdir)/normals.h
+ lament.o: $(srcdir)/rotator.h
diff --git a/xscreensaver.spec b/xscreensaver.spec
index cca9e60..e244b90 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.16
+%define mainversion   5.17
 %define beta_ver      %{nil}
 
 
@@ -63,8 +63,8 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
-# Fix linkage related to forkpty (in utils/textclient.c)
-Patch33:         xscreensaver-5.16-ptylink.patch
+# lament now uses a larger xpm file
+Patch33:         xscreensaver-5.17-lament-newxpm.patch
 #
 # driver/test-passwd tty segfaults
 Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
@@ -259,7 +259,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 .pty
+%patch33 -p1 -b .newxpm
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
 
@@ -811,6 +811,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Jun 23 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.17-1
+- Update to 5.17
+
 * Thu Jun 21 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.16-1
 - Update to 5.16