diff --git a/geos-3.6.1.tar.bz2 b/geos-3.6.1.tar.bz2 deleted file mode 100644 index c23fa59e6ab8a4e8df634773fb1ac9794fc5d88a..0000000000000000000000000000000000000000 Binary files a/geos-3.6.1.tar.bz2 and /dev/null differ diff --git a/geos-3.9.1.tar.bz2 b/geos-3.9.1.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..536af1ee29b47a791c31b0184495cdabb7b3449e Binary files /dev/null and b/geos-3.9.1.tar.bz2 differ diff --git a/geos-gcc43.patch b/geos-gcc43.patch index e1ed6a6d6e0e41a2a7df803b10eb4def56557e91..81a4e7d257e46985c9ae029d5117edf37b21b786 100644 --- a/geos-gcc43.patch +++ b/geos-gcc43.patch @@ -1,8 +1,8 @@ ---- 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 - // geos +--- a/tests/unit/geos_unit.cpp.old 2021-07-08 08:55:02.487941739 +0800 ++++ a/tests/unit/geos_unit.cpp 2021-07-08 08:55:27.692519389 +0800 +@@ -12,6 +12,7 @@ + #include + // geos #include +#include // std diff --git a/geos.spec b/geos.spec index 19957a6f0d157a625b3139e8e7ec9d18c2e02099..062a657ce9159b8bd541e97749d961d4644e9d60 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos -Version: 3.6.1 -Release: 13 +Version: 3.9.1 +Release: 1 Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 URL: http://trac.osgeo.org/geos/ @@ -39,14 +39,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 +#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 +#touch swig/python/geos_wrap.cxx %make_build cd doc @@ -63,7 +63,7 @@ make check || exit 0 %postun -p /sbin/ldconfig %files -%doc AUTHORS COPYING NEWS README TODO +%doc AUTHORS COPYING NEWS README.md %{_libdir}/libgeos-%{version}.so %{_libdir}/libgeos_c.so.1* %exclude %{_libdir}/*.a @@ -76,8 +76,12 @@ make check || exit 0 %{_libdir}/libgeos_c.so %exclude %{_libdir}/*.la %exclude %{_libdir}/*.a +%{_libdir}/pkgconfig/geos.pc %changelog +* Wed Jul 07 2021 xuguangmin - 3.9.1-1 +- upgrade to 3.9.1 + * Wed Nov 11 2020 leiju - 3.6.1-13 - Remove python2 subpackage