pool/geos
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix building with recent gcc

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=13
This commit is contained in:
Martin Pluskal 2016-06-24 09:28:49 +00:00 committed by Git OBS Bridge
parent 0a5b7bb353
commit 4563efa80f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geos.changes
View File

@ -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 Mon Nov 9 15:08:57 UTC 2015 - mpluskal@suse.com

15
geos.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package geos # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -164,6 +164,10 @@ sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile
done done
%endif %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 \ %configure \
--disable-static \ --disable-static \
%if 0%{?suse_version} > 1210 %if 0%{?suse_version} > 1210
@ -183,14 +187,14 @@ make %{?_smp_mflags} doxygen-html
# tests fail with older releases and non-intel architectures # tests fail with older releases and non-intel architectures
# while this was reported to upstream, there has been no reply # while this was reported to upstream, there has been no reply
%if 0%{?suse_version} > 1210 %if 0%{?suse_version} > 1210
%ifarch %ix86 x86_64 %ifarch %{ix86} x86_64
%check %check
make %{?_smp_mflags} check make %{?_smp_mflags} check
%endif %endif
%endif %endif
%install %install
make DESTDIR=%{buildroot} install %{?_smp_mflags} make %{?_smp_mflags} DESTDIR=%{buildroot} install
install -d -m 0755 %{buildroot}%{_mandir}/man1 install -d -m 0755 %{buildroot}%{_mandir}/man1
install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/ install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
@ -213,11 +217,8 @@ chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so
%endif %endif
%post -n libgeos-%{uver} -p /sbin/ldconfig %post -n libgeos-%{uver} -p /sbin/ldconfig
%postun -n libgeos-%{uver} -p /sbin/ldconfig %postun -n libgeos-%{uver} -p /sbin/ldconfig
%post -n libgeos_c1 -p /sbin/ldconfig %post -n libgeos_c1 -p /sbin/ldconfig
%postun -n libgeos_c1 -p /sbin/ldconfig %postun -n libgeos_c1 -p /sbin/ldconfig
%files -n libgeos-%{uver} %files -n libgeos-%{uver}
@ -255,7 +256,7 @@ chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING NEWS README TODO %doc AUTHORS COPYING NEWS README TODO
%{_mandir}/man1/%{name}-config.1.gz %{_mandir}/man1/%{name}-config.1%{ext_man}
%{_bindir}/%{name}-config %{_bindir}/%{name}-config
%{_includedir}/* %{_includedir}/*
%{_libdir}/lib%{name}.so %{_libdir}/lib%{name}.so