[xscreensaver] Update to 5.30
Mamoru TASAKA
mtasaka at fedoraproject.org
Fri Sep 12 06:50:44 UTC 2014
commit 70d037a3ff99c1cec6292e2c85820c777317ad99
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Fri Sep 12 15:50:14 2014 +0900
Update to 5.30
.gitignore | 1 +
sources | 3 +-
...-don-t-pass-negative-value-to-the-index-o.patch | 36 ------
...gine-display-fix-count-size-for-sin_table.patch | 31 -----
...w_histogram-avoid-one-byte-ahead-access-f.patch | 42 ------
...ewline-make-it-sure-that-color-is-set-pos.patch | 58 ---------
...-forallinbank-evaluate-bankc-beforehand-c.patch | 46 -------
...t_braid-limit-braid-braidlength-correctly.patch | 36 ------
...oingies-RenderSproingie-limit-shift-value.patch | 35 -----
...r-demo.glade2-comment-out-has_separator-f.patch | 132 --------------------
xscreensaver.spec | 29 +----
11 files changed, 7 insertions(+), 442 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 723d051..e4142a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ clog
/xscreensaver-5.28.tar.gz
/xscreensaver-5.29.tar.gz
/xscreensaver-5.29-1008-rename-xscreensaver-demo.glade2-to-xscreensaver-demo.patch.gz
+/xscreensaver-5.30.tar.gz
diff --git a/sources b/sources
index 19a2acb..e9e4268 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-14f9104fa03f85371f885bdad956764d xscreensaver-5.29.tar.gz
-ce38b4bc110d714e44bb0963a472e5de xscreensaver-5.29-1008-rename-xscreensaver-demo.glade2-to-xscreensaver-demo.patch.gz
+b71e3a78db1ae14291cc9ff4c5e10911 xscreensaver-5.30.tar.gz
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 6bd1cb5..d8a0040 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
%define name xscreensaver
-%define mainversion 5.29
+%define mainversion 5.30
%define beta_ver %{nil}
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 3
+%define fedora_rel 1
%global use_clang_as_cc 0
%global use_clang_analyze 0
@@ -70,18 +70,6 @@ Patch51: xscreensaver-5.12-test-passwd-segv-tty.patch
Patch52: xscreensaver-5.12-tests-miscfix.patch
#
# Patch with git format-patch format
-# gcc49 sanitizer array element fixes
-Patch1001: xscreensaver-5.29-1001-maze-backup-don-t-pass-negative-value-to-the-index-o.patch
-Patch1002: xscreensaver-5.29-1002-engine-display-fix-count-size-for-sin_table.patch
-Patch1003: xscreensaver-5.29-1003-tronbit-draw_histogram-avoid-one-byte-ahead-access-f.patch
-Patch1004: xscreensaver-5.29-1004-abstract-_newline-make-it-sure-that-color-is-set-pos.patch
-Patch1005: xscreensaver-5.29-1005-vermiculate-forallinbank-evaluate-bankc-beforehand-c.patch
-Patch1006: xscreensaver-5.29-1006-braid-init_braid-limit-braid-braidlength-correctly.patch
-Patch1007: xscreensaver-5.29-1007-sproingies-RenderSproingie-limit-shift-value.patch
-# Remove GtkDialog:has-separator usage to suppress warning for
-# xscreensaver-demo on Fedora 21 and above
-Source1008: xscreensaver-5.29-1008-rename-xscreensaver-demo.glade2-to-xscreensaver-demo.patch.gz
-Patch1009: xscreensaver-5.29-1009-xscreensaver-demo.glade2-comment-out-has_separator-f.patch
# Patches end
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -326,16 +314,6 @@ rm -f driver/XScreenSaver_ad.h
%__git commit -m "Base patches committed" -a
-%__cat %PATCH1001 | %__git am
-%__cat %PATCH1002 | %__git am
-%__cat %PATCH1003 | %__git am
-%__cat %PATCH1004 | %__git am
-%__cat %PATCH1005 | %__git am
-%__cat %PATCH1006 | %__git am
-%__cat %PATCH1007 | %__git am
-%__gzip -dc %SOURCE1008 | %__git am
-%__cat %PATCH1009 | %__git am
-
change_option(){
set +x
@@ -957,6 +935,9 @@ exit 0
%endif
%changelog
+* Fri Sep 12 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.30-1
+- Update to 5.30
+
* Sat Sep 6 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.29-3
- Remove GtkDialog:has-separator usage to suppress warning for
xscreensaver-demo on Fedora 21 and above
More information about the scm-commits
mailing list