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.0.tar.bz2 b/geos-3.9.0.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..a71aa79b973fd93730285be642eaa55fc4f70369 Binary files /dev/null and b/geos-3.9.0.tar.bz2 differ diff --git a/geos-gcc43.patch b/geos-gcc43.patch deleted file mode 100644 index e1ed6a6d6e0e41a2a7df803b10eb4def56557e91..0000000000000000000000000000000000000000 --- a/geos-gcc43.patch +++ /dev/null @@ -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 - // geos - #include -+#include - // std - #include - #include diff --git a/geos.spec b/geos.spec index 19957a6f0d157a625b3139e8e7ec9d18c2e02099..c4dcd7d4fdca502ee6dde82e82225f8b9af69e62 100644 --- a/geos.spec +++ b/geos.spec @@ -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 - 3.9.0-1 +- Upgrade geos to 3.9.0 + * Wed Nov 11 2020 leiju - 3.6.1-13 - Remove python2 subpackage