From 269177f3c3bb6acba912dbc001724692ac7f64bf Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 11:36:51 +0000 Subject: [PATCH] import CS qhull-7.2.1-11.el9 --- SOURCES/qhull-pic.patch | 12 ++++++++++++ SPECS/qhull.spec | 14 +++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 SOURCES/qhull-pic.patch diff --git a/SOURCES/qhull-pic.patch b/SOURCES/qhull-pic.patch new file mode 100644 index 0000000..3aac7cc --- /dev/null +++ b/SOURCES/qhull-pic.patch @@ -0,0 +1,12 @@ +diff -up qhull-7.2.1/CMakeLists.txt.pic qhull-7.2.1/CMakeLists.txt +--- qhull-7.2.1/CMakeLists.txt.pic 2022-01-23 13:36:23.307550832 -0700 ++++ qhull-7.2.1/CMakeLists.txt 2022-01-23 13:45:35.447166635 -0700 +@@ -461,7 +461,7 @@ endif(UNIX) + + add_library(${qhull_CPP} STATIC ${libqhullcpp_SOURCES}) + set_target_properties(${qhull_CPP} PROPERTIES +- VERSION ${qhull_VERSION}) ++ VERSION ${qhull_VERSION} POSITION_INDEPENDENT_CODE ON) + + # --------------------------------------- + # Define qhull executables linked to qhullstatic library diff --git a/SPECS/qhull.spec b/SPECS/qhull.spec index fcc168e..1e7a57d 100644 --- a/SPECS/qhull.spec +++ b/SPECS/qhull.spec @@ -5,12 +5,15 @@ Version: 7.2.1 # - Older releases used year.month # - Newer releases use x.y.z Epoch: 1 -Release: 9%{?dist} +Release: 11%{?dist} License: Qhull Source0: https://github.com/qhull/qhull/archive/v%{version}.tar.gz#/qhull-%{version}.tar.gz Patch1: 0001-Link-executables-against-shared-libs.patch Patch2: 0002-Install-docs-into-subdirs.patch +# Compile libqhullcpp.a with -fPIC +# https://github.com/qhull/qhull/pull/47 +Patch3: qhull-pic.patch URL: http://www.qhull.org @@ -62,6 +65,7 @@ about a point. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build mkdir -p build @@ -115,6 +119,14 @@ chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.* %changelog +* Wed Nov 8 2023 Filip Janus - 1:7.2.1-11 +- Release bump to enable added gating.yaml +- Resolves: RHEL-5625 + +* Mon Aug 21 2023 Filip Janus - 1:7.2.1-10 +- Compile libqhullcpp with -fPIC +- Resolves: RHEL-5625 + * Tue Aug 10 2021 Mohan Boddu - 1:7.2.1-9 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688