diff --git a/.gitignore b/.gitignore index 35dfb24..2512c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /geos-3.7.1.tar.bz2 /geos-3.8.0.tar.bz2 /check_doxygen_errors.cmake +/geos-3.8.1.tar.bz2 diff --git a/geos.spec b/geos.spec index f799c9e..4f9397b 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos -Version: 3.8.0 -Release: 2%{?dist} +Version: 3.8.1 +Release: 1%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 @@ -9,15 +9,10 @@ Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2 # File missing in tarball Source1: https://git.osgeo.org/gitea/geos/geos/raw/branch/master/doc/check_doxygen_errors.cmake -# Backport fix for out-of-bounds array access -# https://github.com/libgeos/geos/commit/3fc652822ef3a825784919423d636c9584dbd2ba.patch -Patch0: 3fc652822ef3a825784919423d636c9584dbd2ba.patch # Honour libsuffix Patch1: geos_libsuffix.patch -# Fix borken geos-config returning -lgeos instead of -lgeos_c -Patch2: geos_geosconfig.patch # Install libgeos.so symlink (some packages still use the C++ API) -Patch3: geos_libgeos.patch +Patch2: geos_libgeos.patch BuildRequires: cmake BuildRequires: doxygen @@ -96,6 +91,9 @@ make test %changelog +* Wed Mar 11 2020 Sandro Mani - 3.8.1-1 +- Update to 3.8.1 + * Tue Mar 03 2020 Sandro Mani - 3.8.0-2 - Install libgeos.so diff --git a/geos_libgeos.patch b/geos_libgeos.patch index cfff4a0..65d279c 100644 --- a/geos_libgeos.patch +++ b/geos_libgeos.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference geos-3.8.0/CMakeLists.txt geos-3.8.0-new/CMakeLists.txt ---- geos-3.8.0/CMakeLists.txt 2020-03-03 15:33:10.497255877 +0100 -+++ geos-3.8.0-new/CMakeLists.txt 2020-03-03 15:33:10.582255890 +0100 +diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists.txt +--- geos-3.8.1/CMakeLists.txt 2020-03-11 13:01:26.003873619 +0100 ++++ geos-3.8.1-new/CMakeLists.txt 2020-03-11 13:01:26.005873623 +0100 @@ -281,7 +281,7 @@ configure_file(cmake/geos-config.cmake install(TARGETS geos geos_cxx_flags diff --git a/geos_libsuffix.patch b/geos_libsuffix.patch index c0269fd..653ab09 100644 --- a/geos_libsuffix.patch +++ b/geos_libsuffix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference geos-3.8.0/CMakeLists.txt geos-3.8.0-new/CMakeLists.txt ---- geos-3.8.0/CMakeLists.txt 2019-10-08 18:20:34.000000000 +0200 -+++ geos-3.8.0-new/CMakeLists.txt 2020-03-03 15:33:10.415255865 +0100 +diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists.txt +--- geos-3.8.1/CMakeLists.txt 2020-01-05 17:44:53.000000000 +0100 ++++ geos-3.8.1-new/CMakeLists.txt 2020-03-11 13:01:25.940873494 +0100 @@ -281,16 +281,16 @@ configure_file(cmake/geos-config.cmake install(TARGETS geos geos_cxx_flags @@ -37,15 +37,15 @@ diff -rupN --no-dereference geos-3.8.0/CMakeLists.txt geos-3.8.0-new/CMakeLists. install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/geos" "${CMAKE_CURRENT_BINARY_DIR}/include/geos" -diff -rupN --no-dereference geos-3.8.0/tools/geos-config.cmake geos-3.8.0-new/tools/geos-config.cmake ---- geos-3.8.0/tools/geos-config.cmake 2019-10-08 18:20:35.000000000 +0200 -+++ geos-3.8.0-new/tools/geos-config.cmake 2020-03-03 15:33:10.415255865 +0100 +diff -rupN --no-dereference geos-3.8.1/tools/geos-config.cmake geos-3.8.1-new/tools/geos-config.cmake +--- geos-3.8.1/tools/geos-config.cmake 2019-10-29 23:44:33.000000000 +0100 ++++ geos-3.8.1-new/tools/geos-config.cmake 2020-03-11 13:01:25.940873494 +0100 @@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@/bin -libdir=@CMAKE_INSTALL_PREFIX@/lib -+libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ ++libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@@LIB_SUFFIX@ usage() { @@ -73,8 +73,8 @@ diff -rupN --no-dereference geos-3.8.0/tools/geos-config.cmake geos-3.8.0-new/to + echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos -lm ;; --ldflags) -- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos -+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos +- echo -L@CMAKE_INSTALL_PREFIX@/lib ++ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ ;; --includes) echo @CMAKE_INSTALL_PREFIX@/include diff --git a/sources b/sources index d48b0ee..6e3b0be 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (geos-3.8.0.tar.bz2) = c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1 -SHA512 (check_doxygen_errors.cmake) = 4764415b279cd7583f8ec2e0150ab2e87f12f7b9c6249ee03bf3a368c12f698c586a6b116ae892395b7d46d620f96d2a1ac6aa16ce4bbf4dc2cdedca9f12e07f +SHA512 (geos-3.8.1.tar.bz2) = 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056