From cae95d62cc7783d99f981e644ec31afeac24a630 Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Tue, 29 Apr 2025 10:53:42 +0200 Subject: [PATCH] Enable gating Cleanup unused patch Resolves: RHEL-81597 --- gating.yaml | 8 +++++ geos_libsuffix.patch | 72 -------------------------------------------- 2 files changed, 8 insertions(+), 72 deletions(-) create mode 100644 gating.yaml delete mode 100644 geos_libsuffix.patch diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..417867b --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - rhel-10 + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.installability.functional} + diff --git a/geos_libsuffix.patch b/geos_libsuffix.patch deleted file mode 100644 index 75adcb4..0000000 --- a/geos_libsuffix.patch +++ /dev/null @@ -1,72 +0,0 @@ -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 18:17:36.000000000 +0100 -+++ geos-3.9.0-new/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100 -@@ -300,16 +300,16 @@ configure_file(cmake/geos-config.cmake - - install(TARGETS geos geos_cxx_flags - EXPORT geos-targets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - INCLUDES DESTINATION include - ) - - install(TARGETS geos_c - EXPORT geos-targets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - INCLUDES DESTINATION include - ) -@@ -317,12 +317,12 @@ install(TARGETS geos_c - install(EXPORT geos-targets - FILE geos-targets.cmake - NAMESPACE GEOS:: -- DESTINATION lib/cmake/GEOS) -+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS) - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake" -- DESTINATION lib/cmake/GEOS) -+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS) - 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-12-09 18:17:36.000000000 +0100 -+++ geos-3.9.0-new/tools/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100 -@@ -36,7 +36,7 @@ if(NOT MSVC) - - 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-07-21 20:07:17.000000000 +0200 -+++ geos-3.9.0-new/tools/geos-config.cmake 2021-03-10 19:25:20.832864575 +0100 -@@ -1,7 +1,7 @@ - #!/bin/sh - - prefix=@ESCAPED_INSTALL_PREFIX@ --libdir=${prefix}/lib -+libdir=${prefix}/lib@LIB_SUFFIX@ - - usage() - { -diff -rupN --no-dereference geos-3.9.0/tools/geos.pc.cmake geos-3.9.0-new/tools/geos.pc.cmake ---- geos-3.9.0/tools/geos.pc.cmake 2020-12-09 18:17:36.000000000 +0100 -+++ geos-3.9.0-new/tools/geos.pc.cmake 2021-03-10 19:25:20.833864575 +0100 -@@ -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