Upgrade geos to 3.9.0

This commit is contained in:
starlet-dx 2022-01-22 20:16:44 +08:00
parent 8564619adf
commit 018258bb33
4 changed files with 8 additions and 20 deletions

Binary file not shown.

BIN
geos-3.9.0.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,10 +0,0 @@
--- a/tests/unit/geos_unit.cpp.old 2009-12-02 13:21:54.000000000 +0200
+++ a/tests/unit/geos_unit.cpp 2009-12-02 13:22:12.000000000 +0200
@@ -9,6 +9,7 @@
#include <tut_reporter.hpp>
// geos
#include <geos/unload.h>
+#include <stdlib.h>
// std
#include <cstdlib>
#include <iomanip>

View File

@ -1,12 +1,10 @@
Name: geos
Version: 3.6.1
Release: 13
Version: 3.9.0
Release: 1
Summary: GEOS is a C++ port of the Java Topology Suite
License: LGPLv2
URL: http://trac.osgeo.org/geos/
Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
#To add stdlib.h
Patch0000: geos-gcc43.patch
BuildRequires: gcc gcc-c++ doxygen libtool
@ -39,18 +37,14 @@ sed -i -e 's|\/lib\/python|$libdir\/python|g' configure
sed -i -e 's|.get_python_lib(0|.get_python_lib(1|g' configure
sed -i -e 's|find \$i -name libpython|find \$i\/lib*\/ -name libpython|g' configure
sed -i -e 's|= isnan(|= std::isnan(|g' configure
sed -i -e 's|(isnan(|(std::isnan(|g' include/geos/platform.h.in
for makefile in `find . -type f -name 'Makefile.in'`; do
sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile
done
%configure --disable-static --disable-dependency-tracking --disable-python
touch swig/python/geos_wrap.cxx
%make_build
cd doc
make doxygen-html
%install
%make_install
@ -63,21 +57,25 @@ make check || exit 0
%postun -p /sbin/ldconfig
%files
%doc AUTHORS COPYING NEWS README TODO
%doc AUTHORS NEWS README.md
%license COPYING
%{_libdir}/libgeos-%{version}.so
%{_libdir}/libgeos_c.so.1*
%exclude %{_libdir}/*.a
%files devel
%doc doc/doxygen_docs
%{_bindir}/geos-config
%{_includedir}/*
%{_libdir}/libgeos.so
%{_libdir}/libgeos_c.so
%exclude %{_libdir}/*.la
%exclude %{_libdir}/*.a
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Sat Jan 22 2022 yaoxin <yaoxin30@huawei.com> - 3.9.0-1
- Upgrade geos to 3.9.0
* Wed Nov 11 2020 leiju<leiju4@huawei.com> - 3.6.1-13
- Remove python2 subpackage