[xscreensaver] Update to 5.22

[Mamoru Tasaka]

commit 102a2e4f7bd5ee1f2a4d13f0dac87b87a1d5297b
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Wed Jul 17 11:51:35 2013 +0900

    Update to 5.22

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 xscreensaver-5.21-apple2-configurenotify.patch     |   12 -
 xscreensaver-5.21-bumps-size.patch                 |  275 --------------------
 xscreensaver-5.21-engine-onebytefix.patch          |   19 --
 xscreensaver-5.21-fireworkx-transit.patch          |   21 --
 xscreensaver-5.21-fix_leak_in_on_path_p.patch      |   11 -
 xscreensaver-5.21-maze-restart.patch               |   11 -
 xscreensaver-5.21-pacman-array-onebyte_ahead.patch |   20 --
 xscreensaver-5.21-polyominoes-from-upstream.patch  |  230 ----------------
 xscreensaver.spec                                  |   37 +---
 11 files changed, 7 insertions(+), 632 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 849b749..5dd4fbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clog
 /xscreensaver-5.19.tar.gz
 /xscreensaver-5.20.tar.gz
 /xscreensaver-5.21.tar.gz
+/xscreensaver-5.22.tar.gz
diff --git a/sources b/sources
index 94a9e2c..a5764a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e9828ab7146d443c9d109cf2a1a4ed2  xscreensaver-5.21.tar.gz
+f78dda2e82a4d22a87d0b7adbabc93f4  xscreensaver-5.22.tar.gz
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 74fee2e..6bfd2e4 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.21
+%define mainversion   5.22
 %define beta_ver      %{nil}
 
 
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    10.1
+%define fedora_rel    1
 
 %global use_clang_analyze 0
 
@@ -65,26 +65,6 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
-# Fix bumps segfault on 64bit (bug 911007)
-Patch33:         xscreensaver-5.21-bumps-size.patch
-# Fix the iteration number for pentomino mode in polyominoes
-# (bug 954077)
-# Revised by the upstream
-Patch34:         xscreensaver-5.21-polyominoes-from-upstream.patch
-# Convert maxlife option from 5.20- for fireworkx (bug 953916)
-Patch35:         xscreensaver-5.21-fireworkx-transit.patch
-# Fix engine crash with one byte ahead access (bug 954115)
-Patch36:         xscreensaver-5.21-engine-onebytefix.patch
-# Fix segfault on pacman (bug 964575)
-Patch37:         xscreensaver-5.21-pacman-array-onebyte_ahead.patch
-# Reinitialize maze on restart, which will perhaps fix
-# maze segv
-Patch38:         xscreensaver-5.21-maze-restart.patch
-# Prevent apple2 segfault when receiving ConfigureNotify event
-# (bug 970402)
-Patch39:         xscreensaver-5.21-apple2-configurenotify.patch
-# Fix memleak in on_path_p
-Patch40:         xscreensaver-5.21-fix_leak_in_on_path_p.patch
 # driver/test-passwd tty segfaults
 Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
@@ -295,16 +275,6 @@ This package contains Clang analyze result of XScreenSaver.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
-%patch33 -p1 -b .bumps_size
-( cd hacks
-%patch34 -p0 -b .polyominoes_upst
-)
-%patch35 -p1 -b .fireworkx.transit
-%patch36 -p1 -b .engine_onebyte
-%patch37 -p1 -b .pacman_onebyte
-%patch38 -p1 -b .maze_restart
-%patch39 -p1 -b .apple2_configure
-%patch40 -p1 -b .mem.on.path.p
 %patch51 -p1 -b .test_passwd
 %patch52 -p1 -b .test_misc
 %patch100 -p1 -b .rpmver
@@ -884,6 +854,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Jul 17 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.22-1
+- Update to 5.22
+
 * Mon Jul  8 2013 Mamoru TASAKA <mtasaka at fedoraproject.org>
 - Add support for Clang analyze for debugging Clang (ref: bug 982081)