From a845cab3cbed742477f31326bec47079032af22b Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 13:52:38 -0400 Subject: [PATCH] Auto sync2gitlab import of qhull-2015.2-5.el8.src.rpm --- .gitignore | 1 + ...Link-executables-against-shared-libs.patch | 45 ++++ 0002-Install-docs-into-subdirs.patch | 33 +++ EMPTY | 1 - qhull.spec | 230 ++++++++++++++++++ sources | 1 + 6 files changed, 310 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 0001-Link-executables-against-shared-libs.patch create mode 100644 0002-Install-docs-into-subdirs.patch delete mode 100644 EMPTY create mode 100644 qhull.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a53fca3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/qhull-2015-src-7.2.0.tgz diff --git a/0001-Link-executables-against-shared-libs.patch b/0001-Link-executables-against-shared-libs.patch new file mode 100644 index 0000000..2af21ab --- /dev/null +++ b/0001-Link-executables-against-shared-libs.patch @@ -0,0 +1,45 @@ +From eae8b33bc3a828b74422fb3bd41d52ba6f0b0048 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.5.5 + diff --git a/0002-Install-docs-into-subdirs.patch b/0002-Install-docs-into-subdirs.patch new file mode 100644 index 0000000..dd9385a --- /dev/null +++ b/0002-Install-docs-into-subdirs.patch @@ -0,0 +1,33 @@ +From ce134bdbddf2fbb28d799792332423dd91faa470 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.5.5 + diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/qhull.spec b/qhull.spec new file mode 100644 index 0000000..b7097d8 --- /dev/null +++ b/qhull.spec @@ -0,0 +1,230 @@ +# Upstream's versioning is bizarre +%global tarvers 2015-src-7.2.0 + +Summary: General dimension convex hull programs +Name: qhull +Version: 2015.2 +Release: 5%{?dist} +License: Qhull +Source0: http://www.qhull.org/download/qhull-%{tarvers}.tgz + +Patch1: 0001-Link-executables-against-shared-libs.patch +Patch2: 0002-Install-docs-into-subdirs.patch + +URL: http://www.qhull.org + +BuildRequires: cmake +BuildRequires: chrpath + +%description +Qhull is a general dimension convex hull program that reads a set +of points from stdin, and outputs the smallest convex set that contains +the points to stdout. It also generates Delaunay triangulations, Voronoi +diagrams, furthest-site Voronoi diagrams, and halfspace intersections +about a point. + +%package -n libqhull +Summary: -n libqhull + +%description -n libqhull +%{summary} + +%package -n libqhull_r +Summary: libqhull_r + +%description -n libqhull_r +%{summary} + +%package -n libqhull_p +Summary: libqhull_p + +%description -n libqhull_p +%{summary} + +%package devel +Summary: Development files for qhull +Requires: lib%{name}%{?_isa} = %{version}-%{release} +Requires: lib%{name}_r%{?_isa} = %{version}-%{release} +Requires: lib%{name}_p%{?_isa} = %{version}-%{release} + +%description devel +Qhull is a general dimension convex hull program that reads a set +of points from stdin, and outputs the smallest convex set that contains +the points to stdout. It also generates Delaunay triangulations, Voronoi +diagrams, furthest-site Voronoi diagrams, and halfspace intersections +about a point. + +%prep +%setup -q -n %{name}-%{version} +%patch1 -p1 +%patch2 -p1 + +%build +mkdir -p build +cd build +%cmake .. +make VERBOSE=1 %{?_smp_mflags} +cd .. + +%install +cd build +make VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT install +cd .. + +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/* + +%files -n libqhull +%{_libdir}/libqhull.so.* + +%post -n libqhull -p /sbin/ldconfig + +%postun -n libqhull -p /sbin/ldconfig + + +%files -n libqhull_r +%{_libdir}/libqhull_r.so.* + +%post -n libqhull_r -p /sbin/ldconfig + +%postun -n libqhull_r -p /sbin/ldconfig + + +%files -n libqhull_p +%{_libdir}/libqhull_p.so.* + +%post -n libqhull_p -p /sbin/ldconfig + +%postun -n libqhull_p -p /sbin/ldconfig + + +%files devel +%{_pkgdocdir}/src/libqhull +%{_pkgdocdir}/src/libqhull_r +%{_libdir}/*.so +%{_includedir}/* +%{_libdir}/libqhullcpp.a +%exclude %{_libdir}/libqhullstatic*.a + + +%changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2015.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2015.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2015.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2015.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Apr 29 2016 Ralf Corsépius - 2015.2-1 +- Update to 2015.2-7.2.0. +- Split out libqhull, libqhull_p, libqhull_r packages. +- drop pkgconfig. + +* Thu Feb 04 2016 Fedora Release Engineering - 2003.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 26 2016 Ralf Corsépius - 2003.1-27 +- Remove %%defattr. +- Add %%license. +- Move docs into *-devel. +- Cleanup spec. + +* Thu Jun 18 2015 Fedora Release Engineering - 2003.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 2003.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2003.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 14 2014 Jaromir Capik - 2003.1-23 +- Fixing format-security flaws (#1037293) + +* Tue Aug 06 2013 Ralf Corsépius - 2003.1-22 +- Reflect docdir changes (RHBZ #993921). +- Fix bogus %%changelog date. + +* Sun Aug 04 2013 Fedora Release Engineering - 2003.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Mar 24 2013 Ralf Corsépius - 2003.1-20 +- Update config.sub,guess for aarch64 (RHBZ #926411). + +* Thu Feb 14 2013 Fedora Release Engineering - 2003.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 2003.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jul 08 2012 Ralf Corsépius - 2003.1-17 +- Modernize spec. +- Add qhull.pc. +- Misc. 64bit fixes. + +* Sat Jan 14 2012 Fedora Release Engineering - 2003.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 2003.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Feb 02 2010 Ralf Corsépius - 2003.1-14 +- Apply upstream's qh_gethash patch +- Silence %%setup. +- Remove rpath. + +* Sun Jul 26 2009 Fedora Release Engineering - 2003.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2003.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu May 22 2008 Tom "spot" Callaway - 2003.1-11 +- fix license tag + +* Tue Mar 04 2008 Ralf Corsépius - 2003.1-10 +- Add qhull-2003.1-alias.patch (BZ 432309) + Thanks to Orion Poplawski (orion@cora.nwra.com). + +* Sun Feb 10 2008 Ralf Corsépius - 2003.1-9 +- Rebuild for gcc43. + +* Wed Aug 22 2007 Ralf Corsépius - 2003.1-8 +- Mass rebuild. + +* Wed Jun 20 2007 Ralf Corsépius - 2003.1-7 +- Remove *.la. + +* Tue Sep 05 2006 Ralf Corsépius - 2003.1-6 +- Mass rebuild. + +* Fri Feb 17 2006 Ralf Corsépius - 2003.1-5 +- Disable static libs. +- Fixup some broken links in doc. +- Add %%{?dist}. + +* Sun May 22 2005 Jeremy Katz - 2003.1-4 +- rebuild on all arches + +* Wed Apr 6 2005 Michael Schwendt +- rebuilt + +* Sun Aug 08 2004 Ralf Corsepius - 2003.1-0.fdr.2 +- Use default documentation installation scheme. + +* Fri Jul 16 2004 Ralf Corsepius - 2003.1-0.fdr.1 +- Initial Fedora RPM. diff --git a/sources b/sources new file mode 100644 index 0000000..a0a2832 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (qhull-2015-src-7.2.0.tgz) = a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4