[xscreensaver/f14] 5.14 is released, with just fixing 5.13 DPMS issue

[Mamoru Tasaka]

commit f12f8c6a4ccbe1503d258d186b1f2d60ad5874b2
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat May 21 14:41:01 2011 +0900

    5.14 is released, with just fixing 5.13 DPMS issue

 .gitignore        |    1 +
 sources           |    2 +-
 xscreensaver.spec |   20 +++++++-------------
 3 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b92e4e2..1e9c18d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xscreensaver-5.11.tar.gz
 /xscreensaver-5.12.tar.gz
 /xscreensaver-5.13.tar.gz
 clog
+/xscreensaver-5.14.tar.gz
diff --git a/sources b/sources
index 4b2fa8c..a43ebdb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1a55b763e17c5c83a2b7cb5ddf23560  xscreensaver-5.13.tar.gz
+7777f2a50d6797f9757b6e078a7bea83  xscreensaver-5.14.tar.gz
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 5c68c84..fbf8562 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.13
+%define mainversion   5.14
 %define beta_ver      %{nil}
 
 
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    3
+%define fedora_rel    1
 
 %undefine extrarel
 
@@ -61,11 +61,7 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 ## Patches which must be discussed with upstream
 #
-# Don't try to change DPMS state on blank-only mode startup
-# (bug 702698, bug 703483)
-# -> Changed to add dpmsQuickOff option after discussion with
-# jwz (also see Debian bug 602157)
-Patch31:         xscreensaver-5.13-add-setting-dpmsQuickoff-from-jwz.patch
+# Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
 #
 # driver/test-passwd tty segfaults
@@ -260,11 +256,6 @@ This package contains some test programs to debug XScreenSaver.
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch30 -p1 -b .conf264
-( cd driver
-echo "Patch #31 ($(basename %PATCH31)):"
-cat %PATCH31 | patch -s -b --suffix .dpmsoff
-)
 %patch32 -p1 -b .dpmsoff_japo
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
@@ -794,8 +785,11 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sat May 21 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.14-1
+- 5.14 is released, with just fixing 5.13 DPMS issue
+
 * Sun May 15 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.13-3
-- Previos fix changed to add dpmsQuickoffEnabled option instead
+- Previous fix changed to add dpmsQuickoffEnabled option instead
   after the discussion with jwz (also see Debian bug 602157)
 
 * Wed May 11 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.13-2