diff --git a/geos.spec b/geos.spec index 4a640d1..4b6f3bd 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos Version: 3.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 @@ -86,6 +86,10 @@ make docs -C %{__cmake_builddir} %changelog +* Wed Mar 10 2021 Benjamin A. Beasley - 3.9.0-3 +- Fix RHBZ#1937424 (Wrong output from geos-config --libs etc.) +- Fix RHBZ#1937443 (Wrong output from pkgconf geos --libs etc.) + * Tue Jan 26 2021 Fedora Release Engineering - 3.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/geos_libsuffix.patch b/geos_libsuffix.patch index 604e5fc..75adcb4 100644 --- a/geos_libsuffix.patch +++ b/geos_libsuffix.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference geos-3.9.0/CMakeLists.txt geos-3.9.0-new/CMakeLists.txt ---- geos-3.9.0/CMakeLists.txt 2020-12-09 01:07:19.000000000 +0100 -+++ geos-3.9.0-new/CMakeLists.txt 2020-12-10 12:23:21.466732306 +0100 +--- geos-3.9.0/CMakeLists.txt 2020-12-09 18:17:36.000000000 +0100 ++++ geos-3.9.0-new/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100 @@ -300,16 +300,16 @@ configure_file(cmake/geos-config.cmake install(TARGETS geos geos_cxx_flags @@ -38,8 +38,8 @@ diff -rupN --no-dereference geos-3.9.0/CMakeLists.txt geos-3.9.0-new/CMakeLists. "${CMAKE_CURRENT_LIST_DIR}/include/geos" "${CMAKE_CURRENT_BINARY_DIR}/include/geos" diff -rupN --no-dereference geos-3.9.0/tools/CMakeLists.txt geos-3.9.0-new/tools/CMakeLists.txt ---- geos-3.9.0/tools/CMakeLists.txt 2020-11-30 20:08:53.000000000 +0100 -+++ geos-3.9.0-new/tools/CMakeLists.txt 2020-12-10 12:23:21.466732306 +0100 +--- geos-3.9.0/tools/CMakeLists.txt 2020-12-09 18:17:36.000000000 +0100 ++++ geos-3.9.0-new/tools/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100 @@ -36,7 +36,7 @@ if(NOT MSVC) install(FILES @@ -50,14 +50,23 @@ diff -rupN --no-dereference geos-3.9.0/tools/CMakeLists.txt geos-3.9.0-new/tools endif() diff -rupN --no-dereference geos-3.9.0/tools/geos-config.cmake geos-3.9.0-new/tools/geos-config.cmake ---- geos-3.9.0/tools/geos-config.cmake 2020-11-30 20:08:53.000000000 +0100 -+++ geos-3.9.0-new/tools/geos-config.cmake 2020-12-10 12:23:21.466732306 +0100 +--- geos-3.9.0/tools/geos-config.cmake 2020-07-21 20:07:17.000000000 +0200 ++++ geos-3.9.0-new/tools/geos-config.cmake 2021-03-10 19:25:20.832864575 +0100 @@ -1,7 +1,7 @@ #!/bin/sh prefix=@ESCAPED_INSTALL_PREFIX@ -libdir=${prefix}/lib -+libdir=${prefix}/lib@LIB_SUFFIX ++libdir=${prefix}/lib@LIB_SUFFIX@ usage() { +diff -rupN --no-dereference geos-3.9.0/tools/geos.pc.cmake geos-3.9.0-new/tools/geos.pc.cmake +--- geos-3.9.0/tools/geos.pc.cmake 2020-12-09 18:17:36.000000000 +0100 ++++ geos-3.9.0-new/tools/geos.pc.cmake 2021-03-10 19:25:20.833864575 +0100 +@@ -8,4 +8,4 @@ Description: Geometry Engine, Open Sourc + Requires: + Version: @GEOS_VERSION@ + Cflags: -I${includedir} +-Libs: -L${libdir} -lgeos_c ++Libs: -L${libdir}@LIB_SUFFIX@ -lgeos_c