rpms/geos
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Benjamin A. Beasley 2021-03-10 11:46:34 -05:00
parent d1ad367d84
commit 1af57a677c
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
geos.spec
View File

@ -88,6 +88,7 @@ make docs -C %{__cmake_builddir}
%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

21
geos_libsuffix.patch
View File

@ -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 @@ diff -rupN --no-dereference geos-3.9.1/CMakeLists.txt geos-3.9.1-new/CMakeLists.
"${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,8 +50,8 @@ diff -rupN --no-dereference geos-3.9.1/tools/CMakeLists.txt geos-3.9.1-new/tools
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
@ -61,3 +61,12 @@ diff -rupN --no-dereference geos-3.9.1/tools/geos-config.cmake geos-3.9.1-new/to
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