From 3f09301571fe043ee0b4e479a69c9747e6e2ff13 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 13 Feb 2021 17:58:01 +0100 Subject: [PATCH] Update to 3.9.1 --- .gitignore | 1 + geos.spec | 9 ++++++--- geos_libsuffix.patch | 22 +++++++++++----------- sources | 3 +-- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index dfeec89..f0290bc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /check_doxygen_errors.cmake /geos-3.8.1.tar.bz2 /geos-3.9.0.tar.bz2 +/geos-3.9.1.tar.bz2 diff --git a/geos.spec b/geos.spec index 4a640d1..8ceab03 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos -Version: 3.9.0 -Release: 2%{?dist} +Version: 3.9.1 +Release: 1%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 @@ -71,7 +71,7 @@ make docs -C %{__cmake_builddir} %files %doc AUTHORS NEWS README.md %license COPYING -%{_libdir}/libgeos.so.3.9.0 +%{_libdir}/libgeos.so.3.9.1 %{_libdir}/libgeos_c.so.1* %files devel @@ -86,6 +86,9 @@ make docs -C %{__cmake_builddir} %changelog +* Thu Feb 11 2021 Sandro Mani - 3.9.1-1 +- Update to 3.9.1 + * 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..04df708 100644 --- a/geos_libsuffix.patch +++ b/geos_libsuffix.patch @@ -1,7 +1,7 @@ -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 +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 +@@ -308,16 +308,16 @@ configure_file(cmake/geos-config.cmake install(TARGETS geos geos_cxx_flags EXPORT geos-targets @@ -22,7 +22,7 @@ diff -rupN --no-dereference geos-3.9.0/CMakeLists.txt geos-3.9.0-new/CMakeLists. RUNTIME DESTINATION bin INCLUDES DESTINATION include ) -@@ -317,12 +317,12 @@ install(TARGETS geos_c +@@ -325,12 +325,12 @@ install(TARGETS geos_c install(EXPORT geos-targets FILE geos-targets.cmake NAMESPACE GEOS:: @@ -37,9 +37,9 @@ diff -rupN --no-dereference geos-3.9.0/CMakeLists.txt geos-3.9.0-new/CMakeLists. install(DIRECTORY "${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 +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 @@ -36,7 +36,7 @@ if(NOT MSVC) install(FILES @@ -49,9 +49,9 @@ 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 +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 @@ -1,7 +1,7 @@ #!/bin/sh diff --git a/sources b/sources index bebba1e..4b2b3bc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (check_doxygen_errors.cmake) = 4764415b279cd7583f8ec2e0150ab2e87f12f7b9c6249ee03bf3a368c12f698c586a6b116ae892395b7d46d620f96d2a1ac6aa16ce4bbf4dc2cdedca9f12e07f -SHA512 (geos-3.9.0.tar.bz2) = 518be112b2e05063d97c09d0e568b784e6c65b0a7be1368cefbd481b3f4ac2d8fc89611e6e205a95f4d1740ab4f47b3929fb4c801bcf9a9e9b6ae86a54e62933 +SHA512 (geos-3.9.1.tar.bz2) = 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28