From 3cdc42bb31ea5a1d9ab78c5b040f7570dac814b4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2020 17:50:38 +0100 Subject: [PATCH] Install libgeos.so --- 3fc652822ef3a825784919423d636c9584dbd2ba.patch | 2 +- geos.spec | 8 +++++++- geos_geosconfig.patch | 4 ++-- geos_libgeos.patch | 12 ++++++++++++ geos_libsuffix.patch | 4 ++-- 5 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 geos_libgeos.patch diff --git a/3fc652822ef3a825784919423d636c9584dbd2ba.patch b/3fc652822ef3a825784919423d636c9584dbd2ba.patch index a6ea662..ec0e027 100644 --- a/3fc652822ef3a825784919423d636c9584dbd2ba.patch +++ b/3fc652822ef3a825784919423d636c9584dbd2ba.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference geos-3.8.0/src/index/chain/MonotoneChainBuilder.cpp geos-3.8.0-new/src/index/chain/MonotoneChainBuilder.cpp --- geos-3.8.0/src/index/chain/MonotoneChainBuilder.cpp 2019-10-08 18:20:35.000000000 +0200 -+++ geos-3.8.0-new/src/index/chain/MonotoneChainBuilder.cpp 2020-02-24 10:59:48.236555133 +0100 ++++ geos-3.8.0-new/src/index/chain/MonotoneChainBuilder.cpp 2020-03-03 15:33:10.329255853 +0100 @@ -96,29 +96,28 @@ MonotoneChainBuilder::findChainEnd(const // (which is the starting quadrant) int chainQuad = Quadrant::quadrant(pts[safeStart], diff --git a/geos.spec b/geos.spec index e3dd66e..f799c9e 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos Version: 3.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 @@ -16,6 +16,8 @@ Patch0: 3fc652822ef3a825784919423d636c9584dbd2ba.patch 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 BuildRequires: cmake BuildRequires: doxygen @@ -89,10 +91,14 @@ make test %{_includedir}/geos/ %{_includedir}/geos_c.h %{_libdir}/libgeos_c.so +%{_libdir}/libgeos.so %{_libdir}/cmake/GEOS/ %changelog +* Tue Mar 03 2020 Sandro Mani - 3.8.0-2 +- Install libgeos.so + * Thu Feb 20 2020 Sandro Mani - 3.8.0-1 - Update to 3.8.0 diff --git a/geos_geosconfig.patch b/geos_geosconfig.patch index e2d16d4..26649c6 100644 --- a/geos_geosconfig.patch +++ b/geos_geosconfig.patch @@ -1,6 +1,6 @@ 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 2020-02-24 10:59:48.382554848 +0100 -+++ geos-3.8.0-new/tools/geos-config.cmake 2020-02-24 10:59:48.383554846 +0100 +--- geos-3.8.0/tools/geos-config.cmake 2020-03-03 15:33:10.497255877 +0100 ++++ geos-3.8.0-new/tools/geos-config.cmake 2020-03-03 15:33:10.499255878 +0100 @@ -59,7 +59,7 @@ case $1 in echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos -lm ;; diff --git a/geos_libgeos.patch b/geos_libgeos.patch new file mode 100644 index 0000000..cfff4a0 --- /dev/null +++ b/geos_libgeos.patch @@ -0,0 +1,12 @@ +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 +@@ -281,7 +281,7 @@ configure_file(cmake/geos-config.cmake + + install(TARGETS geos geos_cxx_flags + EXPORT geos-targets +- LIBRARY DESTINATION lib${LIB_SUFFIX} NAMELINK_SKIP ++ LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION bin + INCLUDES DESTINATION include diff --git a/geos_libsuffix.patch b/geos_libsuffix.patch index 8cea9fb..c0269fd 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-02-24 10:59:48.306554996 +0100 ++++ geos-3.8.0-new/CMakeLists.txt 2020-03-03 15:33:10.415255865 +0100 @@ -281,16 +281,16 @@ configure_file(cmake/geos-config.cmake install(TARGETS geos geos_cxx_flags @@ -39,7 +39,7 @@ diff -rupN --no-dereference geos-3.8.0/CMakeLists.txt geos-3.8.0-new/CMakeLists. "${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-02-24 10:59:48.306554996 +0100 ++++ geos-3.8.0-new/tools/geos-config.cmake 2020-03-03 15:33:10.415255865 +0100 @@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@