[geeqie] Include config.h earlier in some files, so the large file support

[Michael Schwendt]

commit 412424e8a49d8ac1985acfd0c6fb072780077bb6
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Feb 20 12:16:38 2013 +0100

    Include config.h earlier in some files, so the large file support
    
      definition is available early enough for e.g. sys/stat.h
    - Drop the aging Obsoletes tag for gqview.

 geeqie-1.1-large-files.patch |   29 +++++++++++++++++++++++++++++
 geeqie.spec                  |   17 ++++++++++-------
 2 files changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/geeqie-1.1-large-files.patch b/geeqie-1.1-large-files.patch
new file mode 100644
index 0000000..e595c7b
--- /dev/null
+++ b/geeqie-1.1-large-files.patch
@@ -0,0 +1,29 @@
+diff -Nur geeqie-1.1-orig/src/secure_save.c geeqie-1.1/src/secure_save.c
+--- geeqie-1.1-orig/src/secure_save.c	2012-08-12 22:13:41.000000000 +0200
++++ geeqie-1.1/src/secure_save.c	2013-02-20 11:47:41.408733878 +0100
+@@ -9,12 +9,12 @@
+  * This software comes with no warranty of any kind, use at your own risk!
+  */
+ 
++#include "main.h"
+ #include <glib/gprintf.h>
+ #include <glib/gstdio.h>
+ #include <errno.h>
+ #include <utime.h>
+ 
+-#include "main.h"
+ #include "secure_save.h"
+ 
+ 
+diff -Nur geeqie-1.1-orig/src/ui_fileops.h geeqie-1.1/src/ui_fileops.h
+--- geeqie-1.1-orig/src/ui_fileops.h	2012-08-12 22:13:41.000000000 +0200
++++ geeqie-1.1/src/ui_fileops.h	2013-02-20 11:33:03.458028384 +0100
+@@ -14,7 +14,7 @@
+ #ifndef UI_FILEOPS_H
+ #define UI_FILEOPS_H
+ 
+-
++#include "config.h"
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/geeqie.spec b/geeqie.spec
index e35c36e..d0d3907 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: User Interface/X
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -25,6 +25,9 @@ Patch5: geeqie-1.1-filedata-change-notification.patch
 # reported upstream
 # https://sourceforge.net/tracker/?func=detail&aid=3603866&group_id=222125&atid=1054680
 Patch6: geeqie-1.1-filedata-avoid-history-abort.patch
+# reported upstream
+# https://sourceforge.net/tracker/?func=detail&aid=3605406&group_id=222125&atid=1054682
+Patch7: geeqie-1.1-large-files.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
@@ -42,12 +45,6 @@ Requires: exiv2 fbida ImageMagick ufraw zenity
 # Experimental, still disabled by default.
 #BuildRequires: libchamplain-gtk-devel >= 0.4
 
-%if 0%{?fedora} > 13
-# Replace GQView last stable release in Fedora space,
-# plus allow for it to return if a higher version.
-# Stalled upstream GQView development is at 2.1.5.
-Obsoletes: gqview < 2.0.4-13
-%endif
 
 %description
 Geeqie has been forked from the GQview project with the goal of picking up
@@ -71,6 +68,7 @@ done
 %patch4 -p1 -b .editors-NULL
 %patch5 -p1 -b .filedata-notification
 %patch6 -p1 -b .filedata-avoid-history-abort
+%patch7 -p1 -b .large-files
 
 
 %build
@@ -121,6 +119,11 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Feb 20 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-10
+- Include config.h earlier in some files, so the large file support
+  definition is available early enough for e.g. sys/stat.h
+- Drop the aging Obsoletes tag for gqview.
+
 * Fri Feb  8 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-9
 - Avoid abort when opening non-existing paths from history.