PR#3: Fix RHBZ#1937424 and RHBZ#1937443 - rpms/geos

rpms / geos

#3 Fix RHBZ#1937424 and RHBZ#1937443

Merged 2 years ago by smani. Opened 2 years ago by music.

rpms/ music/geos geos-config-patch-typo-fix into rawhide

Fix RHBZ#1937443 (Wrong output from pkgconf geos --libs etc.)

Benjamin A. Beasley • 2 years ago

1af57a6

Fix RHBZ#1937424 (Wrong output from geos-config --libs etc.)

Benjamin A. Beasley • 2 years ago

d1ad367

geos.spec

file modified

+5 -1

		`@@ -1,6 +1,6 @@`
		`Name: geos`
		`Version: 3.9.1`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: GEOS is a C++ port of the Java Topology Suite`

		`License: LGPLv2`
		`@@ -86,6 +86,10 @@`


		`%changelog`
		`+ * Wed Mar 10 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 3.9.1-2`
		`+ - Fix RHBZ#1937424 (Wrong output from geos-config --libs etc.)`
		`+ - Fix RHBZ#1937443 (Wrong output from pkgconf geos --libs etc.)`
		`+`
		`* Thu Feb 11 2021 Sandro Mani <manisandro@gmail.com> - 3.9.1-1`
		`- Update to 3.9.1`

geos_libsuffix.patch

file modified

+16 -7

		`@@ -1,6 +1,6 @@`
		`diff -rupN --no-dereference geos-3.9.1/CMakeLists.txt geos-3.9.1-new/CMakeLists.txt`
		`- --- geos-3.9.1/CMakeLists.txt 2021-02-10 19:10:27.000000000 +0100`
		`- +++ geos-3.9.1-new/CMakeLists.txt 2021-02-11 15:26:25.358373951 +0100`
		`+ --- geos-3.9.1/CMakeLists.txt 2021-02-10 13:10:27.000000000 -0500`
		`+ +++ geos-3.9.1-new/CMakeLists.txt 2021-03-10 11:38:06.200581963 -0500`
		`@@ -308,16 +308,16 @@ configure_file(cmake/geos-config.cmake`

		`install(TARGETS geos geos_cxx_flags`
		`@@ -38,8 +38,8 @@`
		`"${CMAKE_CURRENT_LIST_DIR}/include/geos"`
		`"${CMAKE_CURRENT_BINARY_DIR}/include/geos"`
		`diff -rupN --no-dereference geos-3.9.1/tools/CMakeLists.txt geos-3.9.1-new/tools/CMakeLists.txt`
		`- --- geos-3.9.1/tools/CMakeLists.txt 2021-02-10 19:10:27.000000000 +0100`
		`- +++ geos-3.9.1-new/tools/CMakeLists.txt 2021-02-11 15:26:25.358373951 +0100`
		`+ --- geos-3.9.1/tools/CMakeLists.txt 2021-02-10 13:10:27.000000000 -0500`
		`+ +++ geos-3.9.1-new/tools/CMakeLists.txt 2021-03-10 11:38:06.200581963 -0500`
		`@@ -36,7 +36,7 @@ if(NOT MSVC)`

		`install(FILES`
		`@@ -50,14 +50,23 @@`
		`endif()`

		`diff -rupN --no-dereference geos-3.9.1/tools/geos-config.cmake geos-3.9.1-new/tools/geos-config.cmake`
		`- --- geos-3.9.1/tools/geos-config.cmake 2021-02-04 00:19:53.000000000 +0100`
		`- +++ geos-3.9.1-new/tools/geos-config.cmake 2021-02-11 15:26:25.359373949 +0100`
		`+ --- geos-3.9.1/tools/geos-config.cmake 2021-02-03 18:19:53.000000000 -0500`
		`+ +++ geos-3.9.1-new/tools/geos-config.cmake 2021-03-10 11:38:06.201581969 -0500`
		`@@ -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.1/tools/geos.pc.cmake geos-3.9.1-new/tools/geos.pc.cmake`
		`+ --- geos-3.9.1/tools/geos.pc.cmake 2021-02-03 18:19:53.000000000 -0500`
		`+ +++ geos-3.9.1-new/tools/geos.pc.cmake 2021-03-10 11:40:18.802433179 -0500`
		`+ @@ -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`

music commented 2 years ago

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1937424.

Verified that

geos-config --prefix --version --libs --clibs --cclibs --static-clibs --static-cclibs \
    --cflags --ldflags --includes --jtsport

now produces the expected output (on x86_64):

/usr
3.9.0
-L/usr/lib64 -lgeos-3
-L/usr/lib64 -lgeos_c
-L/usr/lib64 -lgeos
-L/usr/lib64 -lgeos_c -lgeos -lm
-L/usr/lib64 -lgeos -lm
-I/usr/include
-L/usr/lib64
/usr/include
1.17.0

on x86_64.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1937443.

Verified that