Compare commits
No commits in common. "c9" and "c8" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/qhull-7.2.1.tar.gz
|
SOURCES/qhull-2015-src-7.2.0.tgz
|
||||||
|
@ -1 +1 @@
|
|||||||
b31a78d33a61873e4d7aba28e5cb0d292cb8b64a SOURCES/qhull-7.2.1.tar.gz
|
8188765b9f9f004e38e9906fd2a68e81119f05fb SOURCES/qhull-2015-src-7.2.0.tgz
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 3bb42e375672d48f3d8a074396bcd025ab1a6043 Mon Sep 17 00:00:00 2001
|
From eae8b33bc3a828b74422fb3bd41d52ba6f0b0048 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
|
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
|
||||||
Date: Wed, 27 Apr 2016 08:05:53 +0200
|
Date: Wed, 27 Apr 2016 08:05:53 +0200
|
||||||
Subject: [PATCH 1/2] Link executables against shared libs.
|
Subject: [PATCH 1/2] Link executables against shared libs.
|
||||||
@ -41,5 +41,5 @@ index 59dff41..df26bd0 100644
|
|||||||
# ---------------------------------------
|
# ---------------------------------------
|
||||||
# Define options for linking to qhull_SHAREDR or qhull_SHARED
|
# Define options for linking to qhull_SHAREDR or qhull_SHARED
|
||||||
--
|
--
|
||||||
2.21.0
|
2.5.5
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 37ac4361d995b0017560a44bd7088bc2bb3c4436 Mon Sep 17 00:00:00 2001
|
From ce134bdbddf2fbb28d799792332423dd91faa470 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
|
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
|
||||||
Date: Wed, 27 Apr 2016 08:59:21 +0200
|
Date: Wed, 27 Apr 2016 08:59:21 +0200
|
||||||
Subject: [PATCH 2/2] Install docs into subdirs.
|
Subject: [PATCH 2/2] Install docs into subdirs.
|
||||||
@ -29,5 +29,5 @@ index df26bd0..ee647c5 100644
|
|||||||
+install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}/html)
|
+install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}/html)
|
||||||
+install(FILES src/Changes.txt DESTINATION ${DOC_INSTALL_DIR}/src)
|
+install(FILES src/Changes.txt DESTINATION ${DOC_INSTALL_DIR}/src)
|
||||||
--
|
--
|
||||||
2.21.0
|
2.5.5
|
||||||
|
|
||||||
|
@ -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
|
|
@ -1,25 +1,18 @@
|
|||||||
|
# Upstream's versioning is bizarre
|
||||||
|
%global tarvers 2015-src-7.2.0
|
||||||
|
|
||||||
Summary: General dimension convex hull programs
|
Summary: General dimension convex hull programs
|
||||||
Name: qhull
|
Name: qhull
|
||||||
Version: 7.2.1
|
Version: 2015.2
|
||||||
# Add epoch, because upstream changed their versioning scheme:
|
Release: 5%{?dist}
|
||||||
# - Older releases used year.month
|
|
||||||
# - Newer releases use x.y.z
|
|
||||||
Epoch: 1
|
|
||||||
Release: 11%{?dist}
|
|
||||||
License: Qhull
|
License: Qhull
|
||||||
Source0: https://github.com/qhull/qhull/archive/v%{version}.tar.gz#/qhull-%{version}.tar.gz
|
Source0: http://www.qhull.org/download/qhull-%{tarvers}.tgz
|
||||||
|
|
||||||
Patch1: 0001-Link-executables-against-shared-libs.patch
|
Patch1: 0001-Link-executables-against-shared-libs.patch
|
||||||
Patch2: 0002-Install-docs-into-subdirs.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
|
URL: http://www.qhull.org
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
|
|
||||||
@ -50,9 +43,9 @@ Summary: libqhull_p
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for qhull
|
Summary: Development files for qhull
|
||||||
Requires: lib%{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: lib%{name}_r%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: lib%{name}_r%{?_isa} = %{version}-%{release}
|
||||||
Requires: lib%{name}_p%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: lib%{name}_p%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Qhull is a general dimension convex hull program that reads a set
|
Qhull is a general dimension convex hull program that reads a set
|
||||||
@ -62,15 +55,14 @@ diagrams, furthest-site Voronoi diagrams, and halfspace intersections
|
|||||||
about a point.
|
about a point.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -n %{name}-%{version}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
%cmake -S .. -B .
|
%cmake ..
|
||||||
make VERBOSE=1 %{?_smp_mflags}
|
make VERBOSE=1 %{?_smp_mflags}
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
@ -94,19 +86,25 @@ chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*
|
|||||||
%files -n libqhull
|
%files -n libqhull
|
||||||
%{_libdir}/libqhull.so.*
|
%{_libdir}/libqhull.so.*
|
||||||
|
|
||||||
%ldconfig_scriptlets -n libqhull
|
%post -n libqhull -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libqhull -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%files -n libqhull_r
|
%files -n libqhull_r
|
||||||
%{_libdir}/libqhull_r.so.*
|
%{_libdir}/libqhull_r.so.*
|
||||||
|
|
||||||
%ldconfig_scriptlets -n libqhull_r
|
%post -n libqhull_r -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libqhull_r -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%files -n libqhull_p
|
%files -n libqhull_p
|
||||||
%{_libdir}/libqhull_p.so.*
|
%{_libdir}/libqhull_p.so.*
|
||||||
|
|
||||||
%ldconfig_scriptlets -n libqhull_p
|
%post -n libqhull_p -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libqhull_p -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
@ -119,52 +117,6 @@ chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Nov 8 2023 Filip Janus <fjanus@redhat.com> - 1:7.2.1-11
|
|
||||||
- Release bump to enable added gating.yaml
|
|
||||||
- Resolves: RHEL-5625
|
|
||||||
|
|
||||||
* Mon Aug 21 2023 Filip Janus <fjanus@redhat.com> - 1:7.2.1-10
|
|
||||||
- Compile libqhullcpp with -fPIC
|
|
||||||
- Resolves: RHEL-5625
|
|
||||||
|
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:7.2.1-9
|
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:7.2.1-8
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.2.1-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Aug 03 2020 Ralf Corsépius <corsepiu@fedoraproject.org> - 1:7.2.1-6
|
|
||||||
- Work around cmake madness (RHBZ#1863716).
|
|
||||||
|
|
||||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.2.1-5
|
|
||||||
- Second attempt - Rebuilt for
|
|
||||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.2.1-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.2.1-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.2.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed May 22 2019 Ralf Corsépius <corsepiu@fedoraproject.org> - 1:7.2.1-1
|
|
||||||
- Update to 7.2.1.
|
|
||||||
- Rebase patches.
|
|
||||||
- Add Epoch: due to upstream having changed their version numbering scheme.
|
|
||||||
- Reflect Source0: having changed.
|
|
||||||
|
|
||||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2015.2-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2015.2-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2015.2-5
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2015.2-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user