diff --git a/.gitignore b/.gitignore index 1de7a61..3830ede 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qhull-7.2.1.tar.gz +SOURCES/qhull-8.0.2.tar.gz diff --git a/.qhull.metadata b/.qhull.metadata index 5b1f318..9e02282 100644 --- a/.qhull.metadata +++ b/.qhull.metadata @@ -1 +1 @@ -b31a78d33a61873e4d7aba28e5cb0d292cb8b64a SOURCES/qhull-7.2.1.tar.gz +72cd81753781f6d650fee297ab08327440e7180a SOURCES/qhull-8.0.2.tar.gz diff --git a/SOURCES/0001-Link-executables-against-shared-libs.patch b/SOURCES/0001-Link-executables-against-shared-libs.patch deleted file mode 100644 index 46b4481..0000000 --- a/SOURCES/0001-Link-executables-against-shared-libs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3bb42e375672d48f3d8a074396bcd025ab1a6043 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Wed, 27 Apr 2016 08:05:53 +0200 -Subject: [PATCH 1/2] Link executables against shared libs. - ---- - CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 59dff41..df26bd0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -477,22 +477,22 @@ set(qvoronoi_SOURCES src/qvoronoi/qvoronoi.c) - set(qhalf_SOURCES src/qhalf/qhalf.c) - - add_executable(qhull ${qhull_SOURCES}) --target_link_libraries(qhull ${qhull_STATICR}) -+target_link_libraries(qhull ${qhull_SHAREDR}) - - add_executable(rbox ${rbox_SOURCES}) --target_link_libraries(rbox ${qhull_STATIC}) -+target_link_libraries(rbox ${qhull_SHARED}) - - add_executable(qconvex ${qconvex_SOURCES}) --target_link_libraries(qconvex ${qhull_STATIC}) -+target_link_libraries(qconvex ${qhull_SHARED}) - - add_executable(qdelaunay ${qdelaunay_SOURCES}) --target_link_libraries(qdelaunay ${qhull_STATIC}) -+target_link_libraries(qdelaunay ${qhull_SHARED}) - - add_executable(qvoronoi ${qvoronoi_SOURCES}) --target_link_libraries(qvoronoi ${qhull_STATIC}) -+target_link_libraries(qvoronoi ${qhull_SHARED}) - - add_executable(qhalf ${qhalf_SOURCES}) --target_link_libraries(qhalf ${qhull_STATIC}) -+target_link_libraries(qhalf ${qhull_SHARED}) - - # --------------------------------------- - # Define options for linking to qhull_SHAREDR or qhull_SHARED --- -2.21.0 - diff --git a/SOURCES/0002-Install-docs-into-subdirs.patch b/SOURCES/0002-Install-docs-into-subdirs.patch deleted file mode 100644 index 04aa395..0000000 --- a/SOURCES/0002-Install-docs-into-subdirs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 37ac4361d995b0017560a44bd7088bc2bb3c4436 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Wed, 27 Apr 2016 08:59:21 +0200 -Subject: [PATCH 2/2] Install docs into subdirs. - ---- - CMakeLists.txt | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index df26bd0..ee647c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -616,11 +616,12 @@ install(TARGETS ${qhull_TARGETS_INSTALL} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) - - install(FILES ${libqhull_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull) --install(FILES ${libqhull_DOC} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull) --install(FILES ${libqhullr_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r) --install(FILES ${libqhullr_DOC} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r) -+install(FILES ${libqhull_DOC} DESTINATION ${DOC_INSTALL_DIR}/src/libqhull) -+install(FILES ${libqhullr_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r) -+install(FILES ${libqhullr_DOC} DESTINATION ${DOC_INSTALL_DIR}/src/libqhull_r) - install(FILES ${libqhullcpp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhullcpp) - install(FILES html/qhull.man DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1) - install(FILES html/rbox.man DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1) - install(FILES ${doc_FILES} DESTINATION ${DOC_INSTALL_DIR}) --install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}) -+install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}/html) -+install(FILES src/Changes.txt DESTINATION ${DOC_INSTALL_DIR}/src) --- -2.21.0 - diff --git a/SOURCES/qhull-install.patch b/SOURCES/qhull-install.patch new file mode 100644 index 0000000..f40a106 --- /dev/null +++ b/SOURCES/qhull-install.patch @@ -0,0 +1,12 @@ +diff -up qhull-8.0.2/CMakeLists.txt.install qhull-8.0.2/CMakeLists.txt +--- qhull-8.0.2/CMakeLists.txt.install 2022-10-04 22:07:47.273041741 -0600 ++++ qhull-8.0.2/CMakeLists.txt 2022-10-04 22:17:36.977621187 -0600 +@@ -344,7 +344,7 @@ set(qhull_SHAREDP qhull_p) # libqhull a + + set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf) + set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR}) +-set(qhull_TARGETS_SHARED ${qhull_SHAREDR}) ++set(qhull_TARGETS_SHARED ${qhull_SHAREDR} ${qhull_SHARED} ${qhull_SHAREDP}) + + set( + qhull_TARGETS_TEST # Unused diff --git a/SOURCES/qhull-lib64.patch b/SOURCES/qhull-lib64.patch new file mode 100644 index 0000000..2e72162 --- /dev/null +++ b/SOURCES/qhull-lib64.patch @@ -0,0 +1,21 @@ +diff -up qhull-8.0.2/CMakeLists.txt.lib64 qhull-8.0.2/CMakeLists.txt +--- qhull-8.0.2/CMakeLists.txt.lib64 2020-09-03 20:33:16.000000000 -0600 ++++ qhull-8.0.2/CMakeLists.txt 2022-10-04 21:49:12.708081647 -0600 +@@ -709,7 +709,7 @@ configure_file(${PROJECT_SOURCE_DIR}/bui + @ONLY + ) + +-set(ConfigPackageLocation lib/cmake/Qhull) ++set(ConfigPackageLocation ${LIB_INSTALL_DIR}/cmake/Qhull) + install(EXPORT QhullTargets + FILE + QhullTargets.cmake +@@ -728,7 +728,7 @@ install( + Devel + ) + +-set(PkgConfigLocation lib/pkgconfig) ++set(PkgConfigLocation ${LIB_INSTALL_DIR}/pkgconfig) + foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library" + "${qhull_STATIC};Qhull static library" + "${qhull_STATICR};Qhull reentrant static library" diff --git a/SOURCES/qhull-pic.patch b/SOURCES/qhull-pic.patch deleted file mode 100644 index 3aac7cc..0000000 --- a/SOURCES/qhull-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/SOURCES/qhull-staticr-pic.patch b/SOURCES/qhull-staticr-pic.patch new file mode 100644 index 0000000..cf5601a --- /dev/null +++ b/SOURCES/qhull-staticr-pic.patch @@ -0,0 +1,13 @@ +diff -up qhull-8.0.2/CMakeLists.txt.FPIC qhull-8.0.2/CMakeLists.txt +--- qhull-8.0.2/CMakeLists.txt.FPIC 2023-08-10 11:10:20.914574070 -0400 ++++ qhull-8.0.2/CMakeLists.txt 2023-08-10 11:10:56.136136910 -0400 +@@ -447,7 +447,8 @@ set_target_properties(${qhull_STATIC} PR + add_library(${qhull_STATICR} STATIC ${libqhullr_SOURCES}) + set_target_properties(${qhull_STATICR} PROPERTIES + VERSION ${qhull_VERSION} +- OUTPUT_NAME "${qhull_STATICR}$<$:d>") ++ OUTPUT_NAME "${qhull_STATICR}$<$:d>" ++ POSITION_INDEPENDENT_CODE "TRUE") + + if(UNIX) + target_link_libraries(${qhull_STATIC} m) diff --git a/SPECS/qhull.spec b/SPECS/qhull.spec index 1e7a57d..5a8a7cd 100644 --- a/SPECS/qhull.spec +++ b/SPECS/qhull.spec @@ -1,19 +1,21 @@ Summary: General dimension convex hull programs Name: qhull -Version: 7.2.1 +Version: 8.0.2 # Add epoch, because upstream changed their versioning scheme: # - Older releases used year.month # - Newer releases use x.y.z Epoch: 1 -Release: 11%{?dist} +Release: 2%{?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 +# Install cmake and pkgconfig file into proper libdir +# https://github.com/qhull/qhull/pull/123 +Patch0: qhull-lib64.patch +# Install extra targets - libqhull and qhull_p +Patch1: qhull-install.patch +# The static_r library needs fPIC +Patch2: qhull-staticr-pic.patch URL: http://www.qhull.org @@ -53,6 +55,7 @@ Summary: Development files for qhull Requires: lib%{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: lib%{name}_r%{?_isa} = %{epoch}:%{version}-%{release} Requires: lib%{name}_p%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel Qhull is a general dimension convex hull program that reads a set @@ -63,15 +66,17 @@ about a point. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -P0 -p1 -b .lib64 +%patch -P1 -p1 -b .install +%patch -P2 -p1 -b .pic %build mkdir -p build cd build -%cmake -S .. -B . +%cmake -S .. -B . -DLINK_APPS_SHARED=ON make VERBOSE=1 %{?_smp_mflags} +# These items are deprecated as of 8.0.2 +make VERBOSE=1 %{?_smp_mflags} libqhull qhull_p cd .. %install @@ -85,8 +90,6 @@ chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.* %files %{_pkgdocdir} %exclude %{_pkgdocdir}/COPYING.txt -%exclude %{_pkgdocdir}/src/libqhull -%exclude %{_pkgdocdir}/src/libqhull_r %license COPYING.txt %{_bindir}/* %{_mandir}/man1/* @@ -110,29 +113,45 @@ chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.* %files devel -%{_pkgdocdir}/src/libqhull -%{_pkgdocdir}/src/libqhull_r %{_libdir}/*.so %{_includedir}/* +# Easier to include these than to hack them out of the cmake bits %{_libdir}/libqhullcpp.a -%exclude %{_libdir}/libqhullstatic*.a - +%{_libdir}/libqhullstatic*.a +%dir %{_libdir}/cmake/Qhull +%{_libdir}/cmake/Qhull/QhullConfig*.cmake +%{_libdir}/cmake/Qhull/QhullTargets*.cmake +%{_libdir}/pkgconfig/qhull_r.pc +%{_libdir}/pkgconfig/qhullcpp.pc +%{_libdir}/pkgconfig/qhullstatic*.pc %changelog -* Wed Nov 8 2023 Filip Janus - 1:7.2.1-11 -- Release bump to enable added gating.yaml -- Resolves: RHEL-5625 +* Sat Dec 28 2024 Arkady L. Shane - 8.0.2-2 +- Rebuilt for MSVSphere 10 + +* Thu Aug 10 2023 Tom Callaway - 1:8.0.2-2 +- make the static_r library pic + +* Thu Aug 3 2023 Tom Callaway - 1:8.0.2-1 +- update to 8.0.2 (thanks to Orion Poplawski) -* Mon Aug 21 2023 Filip Janus - 1:7.2.1-10 +* Fri Jul 21 2023 Fedora Release Engineering - 1:7.2.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 1:7.2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Oct 02 2022 Orion Poplawski - 1:7.2.1-11 - 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 +* Fri Jul 22 2022 Fedora Release Engineering - 1:7.2.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1:7.2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 1:7.2.1-8 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Fri Jul 23 2021 Fedora Release Engineering - 1:7.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Wed Jan 27 2021 Fedora Release Engineering - 1:7.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild