From 4563efa80f37edf4349da6c649f0aaff5cd83579260c36af24ee77846dc9517b Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Fri, 24 Jun 2016 09:28:49 +0000
Subject: [PATCH] - Fix building with recent gcc

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=13
---
 geos.changes |  5 +++++
 geos.spec    | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/geos.changes b/geos.changes
index 2b51a8d..df2f07e 100644
--- a/geos.changes
+++ b/geos.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 24 09:28:19 UTC 2016 - mpluskal@suse.com
+
+- Fix building with recent gcc 
+
 -------------------------------------------------------------------
 Mon Nov  9 15:08:57 UTC 2015 - mpluskal@suse.com
 
diff --git a/geos.spec b/geos.spec
index edba47c..639db59 100644
--- a/geos.spec
+++ b/geos.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package geos
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -164,6 +164,10 @@ sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile
 done
 %endif
 
+# isnan is in math.h, std::isnan is in cmath
+sed -i -e 's|= isnan(|= std::isnan(|g' configure
+sed -i -e 's|(isnan(|(std::isnan(|g' include/geos/platform.h.in
+
 %configure \
 	--disable-static \
 	%if 0%{?suse_version} > 1210
@@ -183,14 +187,14 @@ make %{?_smp_mflags} doxygen-html
 # tests fail with older releases and non-intel architectures
 # while this was reported to upstream, there has been no reply
 %if 0%{?suse_version} > 1210
-%ifarch %ix86 x86_64
+%ifarch %{ix86} x86_64
 %check
 make %{?_smp_mflags} check
 %endif
 %endif
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
 install -d -m 0755 %{buildroot}%{_mandir}/man1
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
@@ -213,11 +217,8 @@ chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so
 %endif
 
 %post   -n libgeos-%{uver} -p /sbin/ldconfig
-
 %postun -n libgeos-%{uver} -p /sbin/ldconfig
-
 %post   -n libgeos_c1 -p /sbin/ldconfig
-
 %postun -n libgeos_c1 -p /sbin/ldconfig
 
 %files -n libgeos-%{uver}
@@ -255,7 +256,7 @@ chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so
 %files devel
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README TODO
-%{_mandir}/man1/%{name}-config.1.gz
+%{_mandir}/man1/%{name}-config.1%{ext_man}
 %{_bindir}/%{name}-config
 %{_includedir}/*
 %{_libdir}/lib%{name}.so