Update to 3.9.0

2020-12-10 13:38:33 +01:00 · 2020-12-10 13:38:33 +01:00 · f2c3d2f7fa
commit f2c3d2f7fa
parent a068996c46
6 changed files with 39 additions and 1492 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@
 /geos-3.8.0.tar.bz2
 /check_doxygen_errors.cmake
 /geos-3.8.1.tar.bz2
+/geos-3.9.0.tar.bz2
--- a/geos.spec
+++ b/geos.spec
@ -1,6 +1,6 @@
 Name:          geos
-Version:       3.8.1
-Release:       3%{?dist}
+Version:       3.9.0
+Release:       1%{?dist}
 Summary:       GEOS is a C++ port of the Java Topology Suite

 License:       LGPLv2
@ -11,13 +11,6 @@ Source1:       http://git.osgeo.org/gitea/geos/geos/raw/tag/%{version}/doc/check

 # Honour libsuffix
 Patch1:        geos_libsuffix.patch
-# Install libgeos.so symlink (some packages still use the C++ API)
-Patch2:        geos_libgeos.patch
-# remove ttmath in favour of DD
-# backported from upstream: https://git.osgeo.org/gitea/geos/geos/commit/bed36f15
-# simplified to drop the rm diffs for easier rebasing
-# fixes https://bugzilla.redhat.com/show_bug.cgi?id=1841335
-Patch3:        geos_remove_ttmath.patch

 BuildRequires: cmake
 BuildRequires: doxygen
@ -53,16 +46,13 @@ use GEOS.
 %autosetup -p1
 cp -a %{SOURCE1} doc/check_doxygen_errors.cmake

-# Goes together with Patch3:
-rm -r include/geos/algorithm/ttmath
-

 %build
 %cmake \
-%ifarch armv7hl aarch64 s390x
-  -DDISABLE_GEOS_INLINE=ON \
+%ifarch armv7hl
+    -DDISABLE_GEOS_INLINE=ON \
 %endif
-  -DBUILD_DOCUMENTATION=ON
+    -DBUILD_DOCUMENTATION=ON
 %cmake_build


@ -72,11 +62,7 @@ make docs -C %{__cmake_builddir}


 %check
-%ifarch armv7hl aarch64 s390x ppc64le
-%ctest || :
-%else
 %ctest
-%endif


 %ldconfig_scriptlets
@ -85,7 +71,7 @@ make docs -C %{__cmake_builddir}
 %files
 %doc AUTHORS NEWS README.md
 %license COPYING
-%{_libdir}/libgeos.so.%{version}
+%{_libdir}/libgeos.so.3.9.0
 %{_libdir}/libgeos_c.so.1*

 %files devel
@ -96,9 +82,13 @@ make docs -C %{__cmake_builddir}
 %{_libdir}/libgeos_c.so
 %{_libdir}/libgeos.so
 %{_libdir}/cmake/GEOS/
+%{_libdir}/pkgconfig/%{name}.pc


 %changelog
+* Thu Dec 10 2020 Sandro Mani <manisandro@gmail.com> - 3.9.0-1
+- Update to 3.9.0
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

--- a/geos_libgeos.patch
+++ b/geos_libgeos.patch
@ -1,12 +0,0 @@
-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 14:56:49.830174310 +0100
-+++ geos-3.8.1-new/CMakeLists.txt	2020-03-11 14:56:49.832174317 +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
--- a/geos_libsuffix.patch
+++ b/geos_libsuffix.patch
@ -1,13 +1,13 @@
-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 14:56:49.760174088 +0100
-@@ -281,16 +281,16 @@ configure_file(cmake/geos-config.cmake
+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
+@@ -300,16 +300,16 @@ configure_file(cmake/geos-config.cmake
 
 install(TARGETS geos geos_cxx_flags
   EXPORT geos-targets
-  LIBRARY DESTINATION lib NAMELINK_SKIP
+-  LIBRARY DESTINATION lib
 -  ARCHIVE DESTINATION lib
-+  LIBRARY DESTINATION lib${LIB_SUFFIX} NAMELINK_SKIP
+  LIBRARY DESTINATION lib${LIB_SUFFIX}
 +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
   RUNTIME DESTINATION bin
   INCLUDES DESTINATION include
@ -22,7 +22,7 @@ diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists.
   RUNTIME DESTINATION bin
   INCLUDES DESTINATION include
   )
-@@ -298,12 +298,12 @@ install(TARGETS geos_c
+@@ -317,12 +317,12 @@ install(TARGETS geos_c
 install(EXPORT geos-targets
   FILE geos-targets.cmake
   NAMESPACE GEOS::
@ -37,44 +37,27 @@ diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists.
 install(DIRECTORY
   "${CMAKE_CURRENT_LIST_DIR}/include/geos"
   "${CMAKE_CURRENT_BINARY_DIR}/include/geos"
-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 14:56:49.760174088 +0100
-@@ -2,7 +2,7 @@
+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
+@@ -36,7 +36,7 @@ if(NOT MSVC)
 
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
-libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@@LIB_SUFFIX@
+   install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/geos.pc
+-    DESTINATION lib/pkgconfig)
+    DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ 
+ 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
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ prefix=@ESCAPED_INSTALL_PREFIX@
+-libdir=${prefix}/lib
+libdir=${prefix}/lib@LIB_SUFFIX
 
 usage()
 {
-@@ -44,22 +44,22 @@ case $1 in
-       echo -I@CMAKE_INSTALL_PREFIX@/include
-       ;;
-     --libs)
-      echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos-@GEOS_VERSION_MAJOR@
-+      echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos-@GEOS_VERSION_MAJOR@
-       ;;
-     --clibs)
-      echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos_c
-+      echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos_c
-       ;;
-     --cclibs)
-      echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos
-+      echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos
-       ;;
-     --static-clibs)
-      echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos_c -lgeos -lm
-+      echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos_c -lgeos -lm
-       ;;
-     --static-cclibs)
-      echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos -lm
-+      echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos -lm
-       ;;
-     --ldflags)
-      echo -L@CMAKE_INSTALL_PREFIX@/lib 
-+      echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
-       ;;
-     --includes)
-       echo @CMAKE_INSTALL_PREFIX@/include
--- a/geos_remove_ttmath.patch
+++ b/geos_remove_ttmath.patch
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (check_doxygen_errors.cmake) = 4764415b279cd7583f8ec2e0150ab2e87f12f7b9c6249ee03bf3a368c12f698c586a6b116ae892395b7d46d620f96d2a1ac6aa16ce4bbf4dc2cdedca9f12e07f
-SHA512 (geos-3.8.1.tar.bz2) = 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
+SHA512 (geos-3.9.0.tar.bz2) = 518be112b2e05063d97c09d0e568b784e6c65b0a7be1368cefbd481b3f4ac2d8fc89611e6e205a95f4d1740ab4f47b3929fb4c801bcf9a9e9b6ae86a54e62933