[xscreensaver/f14/master] Update to 5.13
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue Apr 19 14:51:07 UTC 2011
commit fc0936d80188af1bdd48a489dcf0b8e6c84360a8
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Tue Apr 19 23:51:14 2011 +0900
Update to 5.13
.gitignore | 1 +
sources | 2 +-
xscreensaver-5.12-apple2-1byte-ahead.patch | 16 -
xscreensaver-5.12-flame-completely-blank.patch | 22 --
...aver-5.12-for-now-set-lang-on-daemon-to-C.patch | 18 -
xscreensaver-5.12-gltext-memleak.patch | 11 -
...ensaver-5.12-gtkspinbox-page-size-to-zero.patch | 65 ----
...5.12-upst-XLookupString-may-return-string.patch | 337 --------------------
....12-warn-only-once-with-missing-image-dir.patch | 67 ----
xscreensaver-5.12-webcollage-ppm-gnome569671.patch | 22 --
xscreensaver-5.12-wormhole-fpe.patch | 10 -
xscreensaver-5.12-xml-duplicate-list.patch | 11 -
xscreensaver.spec | 48 +---
13 files changed, 7 insertions(+), 623 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c26c0b..6961758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xscreensaver-5.11.tar.gz
/xscreensaver-5.12.tar.gz
+/xscreensaver-5.13.tar.gz
diff --git a/sources b/sources
index c97a843..4b2fa8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0345c1acb9280729de05c5ca44b401e3 xscreensaver-5.12.tar.gz
+a1a55b763e17c5c83a2b7cb5ddf23560 xscreensaver-5.13.tar.gz
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 62a2217..c58c8d0 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
%define name xscreensaver
-%define mainversion 5.12
+%define mainversion 5.13
%define beta_ver %{nil}
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 14
+%define fedora_rel 1
%undefine extrarel
@@ -64,37 +64,6 @@ Patch30: xscreensaver-5.11-conf264.patch
## Patch31, 32, 33, 34, 35, 36, 37, 38, 39: already sent to the upstream
## Patch40: from the upstream
#
-# For now set LANG to C for daemon because some garbage character appears
-# on passwd prompt
-Patch31: xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
-# Kill memleak on gltext (bug 638600)
-Patch32: xscreensaver-5.12-gltext-memleak.patch
-# Remove duplicate xml files entry
-Patch33: xscreensaver-5.12-xml-duplicate-list.patch
-# Fix the issue that flame is completely blank (bug 642651)
-Patch34: xscreensaver-5.12-flame-completely-blank.patch
-# Remove Gtk-warning
-# "GtkSpinButton: setting an adjustment with non-zero page size is deprecated"
-Patch35: xscreensaver-5.12-gtkspinbox-page-size-to-zero.patch
-# Warn (not say "Error") about missing image directory, and warn
-# only once (bug 648304)
-Patch36: xscreensaver-5.12-warn-only-once-with-missing-image-dir.patch
-# wormhole causes SIGFPE with some size of window (bug 665752)
-Patch37: xscreensaver-5.12-wormhole-fpe.patch
-# Fix one-byte ahead access in apple2.c (may fix bug 666643)
-Patch38: xscreensaver-5.12-apple2-1byte-ahead.patch
-# Make webcollage work again
-# Due to the change in https://bugzilla.gnome.org/show_bug.cgi?id=569671
-# gdk_pixbuf_new_from_file won't recognize ppm file without suffix in filename
-#
-# Well, (after discussing with the upstream) the upstream sees that this issue
-# should be fixed in gdk-pixbuf side, so the upstream may not apply the
-# following patch, however on Fedora let's carry this.
-Patch39: xscreensaver-5.12-webcollage-ppm-gnome569671.patch
-# Cannot type non-ascii character on password window
-# https://bugs.launchpad.net/ubuntu/+source/xscreensaver/+bug/671923
-# Patch sent from the upstream, a bit modified
-Patch40: xscreensaver-5.12-upst-XLookupString-may-return-string.patch
# driver/test-passwd tty segfaults
Patch41: xscreensaver-5.12-test-passwd-segv-tty.patch
# patch to compile driver/test-xdpms
@@ -288,16 +257,6 @@ This package contains some test programs to debug XScreenSaver.
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
%patch30 -p1 -b .conf264
-%patch31 -p1 -b .langc
-%patch32 -p1 -b .gltext_mem
-%patch33 -p1 -b .xmllist
-%patch34 -p1 -b .flame_blank
-%patch35 -p1 -b .spin_warn
-%patch36 -p1 -b .warn_once
-%patch37 -p1 -b .wormhole
-%patch38 -p1 -b .apple2_byte
-%patch39 -p1 -b .webc.ppm
-%patch40 -p1 -b .non_ascii
%patch41 -p1 -b .test_passwd
%patch42 -p1 -b .test_misc
@@ -826,6 +785,9 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Tue Apr 19 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.13-1
+- Update to 5.13
+
* Sun Apr 3 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.12-14
- Patch40 revised by jwz
- Fix segv on test-passwd
More information about the scm-commits
mailing list