[xscreensaver] Also change xscreensaver.spec

[Mamoru Tasaka]

commit c1ba5b7616616db4a0048b90d2e06dfc894de39f
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Oct 17 10:50:45 2012 +0900

    Also change xscreensaver.spec

 xscreensaver.spec |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/xscreensaver.spec b/xscreensaver.spec
index d088698..b1fb2be 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.19
+%define mainversion   5.20
 %define beta_ver      %{nil}
 
 
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    4
+%define fedora_rel    1
 
 %undefine extrarel
 
@@ -32,7 +32,7 @@ Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{mainversion}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
+Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         MIT
 Group:           Amusements/Graphics
@@ -63,13 +63,8 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
-# Fix segv on lament with -wireframe option 
-# or -no-texture option (bug 849961)
-Patch33:         xscreensaver-5.19-lament-wireframe.patch
-# Fix improper and operator on flurry detected by llvm-clang
-Patch34:         xscreensaver-5.19-flurry-clangwarn.patch
-# Remove warning from calling glLighti with float argument in engine.c
-Patch35:         xscreensaver-5.19-engine-clangwarn.patch
+# Add -D_FILE_OFFSET_BITS=64 when this enabled stat64
+Patch37:         xscreensaver-5.19-check-largefile-support.patch
 # driver/test-passwd tty segfaults
 Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
@@ -268,9 +263,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
-%patch33 -p1 -b .wire
-%patch34 -p1 -b .andand
-%patch35 -p1 -b .fl_int
+%patch37 -p1 -b .large
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
 %patch43 -p1 -b .hndl_extra
@@ -427,7 +420,8 @@ popd
 export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}"
 # Build with -D_FILE_OFFSET_BITS=64 to support cifs-mounted
 # filesystem for image directory (Ubuntu bug 609451)
-export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
+# The below line changed to use Patch37
+# export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
 
 CONFIG_OPTS="--prefix=%{_prefix} --with-pam --without-shadow --without-kerberos"
 CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks"
@@ -824,6 +818,16 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Oct 17 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.20-1
+- Update to 5.20
+
+* Sun Oct  7 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.19-6
+- Use AC_SYS_LARGEFILE to detect support for -D_FILE_OFFSET_BITS=64
+
+* Wed Oct  3 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.19-5
+- May fix xscreensaver-getimage failure with BadMatch in
+  XPutImage (may fix debian bug 688955)
+
 * Fri Sep 21 2012 Mamoru Tasaka <mtasaka at fedoraproject.org>
 - A bit spec file cleanup