[xscreensaver] Update to 5.28

Mamoru TASAKA mtasaka at fedoraproject.org
Thu Jun 5 03:18:23 UTC 2014


commit 279a7e99f24f3a5a4450763b0d8b7b4228929738
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Thu Jun 5 12:17:46 2014 +0900

    Update to 5.28

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...ile.in-add-thread-related-flags-correctly.patch |   68 ------------
 ...aunay-don-t-use-double-backslash-comments.patch |   30 -----
 ...r-Makefile.in-readd-INTLTOOL_DESKTOP_RULE.patch |   29 -----
 ...le.in.in-add-comments-after-POTFILES-line.patch |   26 -----
 ...5.27-0005-Remove-GLib-deprecated-warnings.patch |  112 --------------------
 ...ve-clang-Winvalid-source-encoding-warning.patch |   34 ------
 ...-add-skeleten-definition-for-reset_watchd.patch |   27 -----
 xscreensaver.spec                                  |   30 +-----
 10 files changed, 7 insertions(+), 352 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c30310..cccde8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
 /xscreensaver-5.23.tar.gz
 /xscreensaver-5.26.tar.gz
 /xscreensaver-5.27.tar.gz
+/xscreensaver-5.28.tar.gz
diff --git a/sources b/sources
index 3985b36..633a3d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42582268cf7db0a12836a3240c83726e  xscreensaver-5.27.tar.gz
+9f86ef921b55ccc9efa1ffd7ca437332  xscreensaver-5.28.tar.gz
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 1265284..6800a8c 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.27
+%define mainversion   5.28
 %define beta_ver      %{nil}
 
 
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    2
+%define fedora_rel    1
 
 %global use_clang_as_cc 0
 %global use_clang_analyze 0
@@ -69,22 +69,7 @@ Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
 Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
 Patch52:         xscreensaver-5.12-tests-miscfix.patch
-# Fix test-passwd compilation for lock.c change
-Patch61:         xscreensaver-5.27-1001-test-passwd-add-skeleten-definition-for-reset_watchd.patch
 # 
-## Patches which must be discussed with upstream
-# Patch for hacks under hacks/ using pthread
-Patch101:        xscreensaver-5.27-0001-hacks-Makefile.in-add-thread-related-flags-correctly.patch
-# c89 compilation for delauary
-Patch102:        xscreensaver-5.27-0002-delaunay-don-t-use-double-backslash-comments.patch
-# desktop file installation
-Patch103:        xscreensaver-5.27-0003-driver-Makefile.in-readd-INTLTOOL_DESKTOP_RULE.patch
-# Recent intltool needs this
-Patch104:        xscreensaver-5.27-0004-po-Makefile.in.in-add-comments-after-POTFILES-line.patch
-# Remove GLib deprecation warning
-Patch105:        xscreensaver-5.27-0005-Remove-GLib-deprecated-warnings.patch
-# Remove clang -Winvalid-source-encoding warning
-Patch106:        xscreensaver-5.27-0006-Remove-clang-Winvalid-source-encoding-warning.patch
 # Patch with git format-patch format
 # Shut down cppcheck error / warning messages
 # Shutdown gcc fsanitize error
@@ -332,14 +317,6 @@ rm -f driver/XScreenSaver_ad.h
 
 %__git commit -m "Base patches committed" -a
 
-cat %PATCH61 | %__git am
-cat %PATCH101 | %__git am
-cat %PATCH102 | %__git am
-cat %PATCH103 | %__git am
-cat %PATCH104 | %__git am
-cat %PATCH105 | %__git am
-cat %PATCH106 | %__git am
-
 change_option(){
    set +x
    ADFILE=$1
@@ -952,6 +929,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Jun  5 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.28-1
+- Update to 5.28
+
 * Fri May 30 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.27-2
 - Remove GLib and invalid-source-encoding warnings on clang
 - Re-generate driver/XScreenSaver_ad.h correctly


More information about the scm-commits mailing list