Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qhull for openSUSE:Factory checked
in at 2021-04-24 23:07:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qhull (Old)
and /work/SRC/openSUSE:Factory/.qhull.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qhull"
Sat Apr 24 23:07:09 2021 rev:21 rq:887851 version:2020.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qhull/qhull.changes 2020-11-02
09:40:45.597631031 +0100
+++ /work/SRC/openSUSE:Factory/.qhull.new.12324/qhull.changes 2021-04-24
23:07:33.307259220 +0200
@@ -1,0 +2,15 @@
+Mon Mar 29 23:36:48 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Drop deprecated (non-reentrant) qhull headers since we don't
+ provide the corresponding shared lib.
+- Move the qhull_r libs, headers, related files into new shared
+ lib libqhull_r and qhull_r-devel packages as appropriate; have
+ qhull_r-devel provide qhull-devel.
+- Move qhullcpp library, headers, and pkgconfig file into separate
+ qhullcpp-devel-static package.
+- qhullcpp is only supported as static library and needs to be
+ built with "-ffat-lto-objects"; add this to CXXFLAGS.
+- Delete unnecessary pkgconfig files corresponding to static libs
+ that are not built/installed.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qhull.spec ++++++
--- /var/tmp/diff_new_pack.wlsMTU/_old 2021-04-24 23:07:33.839259970 +0200
+++ /var/tmp/diff_new_pack.wlsMTU/_new 2021-04-24 23:07:33.843259976 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qhull
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -60,30 +60,47 @@
non-convex surfaces, mesh generation of non-convex objects, or medium-sized
inputs in 9-D and higher.
-%package devel
+%package -n qhull_r-devel
Summary: Development and documentation files for qhull
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
+Provides: qhull-devel = %{version}
+Obsoletes: qhull-devel < %{version}
-%description devel
+%description -n qhull_r-devel
Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram,
halfspace intersection about a point, furthest-site Delaunay triangulation,
and furthest-site Voronoi diagram.
This package contains the header files for the Qhull libraries.
+%package -n qhullcpp-devel-static
+Summary: Development and documentation files for qhull - C++ interface
+Group: Development/Libraries/C and C++
+Requires: %{libname} = %{version}
+
+%description -n qhullcpp-devel-static
+Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram,
+halfspace intersection about a point, furthest-site Delaunay triangulation,
+and furthest-site Voronoi diagram.
+
+This package contains the header files and static lib for Qhull's C++
interface.
+
%prep
%setup -q
%patch1 -p1
%build
+# Needed for static lib libqhullcpp.a
+export CXXFLAGS+=" -ffat-lto-objects"
+
%cmake \
-DDOC_INSTALL_DIR="%{_docdir}/%{name}" \
-DINCLUDE_INSTALL_DIR="%{_includedir}" \
-DLIB_INSTALL_DIR="%{_lib}" \
-DBIN_INSTALL_DIR="%{_bindir}" \
-DMAN_INSTALL_DIR="%{_mandir}/man1/"
-%cmake_build
+%cmake_build qhullcpp
%install
%cmake_install
@@ -94,6 +111,15 @@
%endif
rm %{buildroot}%{_docdir}/%{name}/COPYING.txt
+# Manually install cpp lib since it isn't installed by make install
+find ./ -name "libqhullcpp.a" -print -exec install -m0644 {}
%{buildroot}%{_libdir}/ \;
+
+# We don't install static libs for qhull, so don't install the corresponding
pkgconfig files either
+rm %{buildroot}%{_libdir}/pkgconfig/qhullstatic*.pc
+
+# Remove deprecated qhull headers
+rm -fr %{buildroot}%{_includedir}/libqhull
+
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
@@ -112,12 +138,15 @@
%license COPYING.txt
%{_libdir}/libqhull_r.so.*
-%files devel
-%{_includedir}/libqhull/
+%files -n qhull_r-devel
%{_includedir}/libqhull_r/
-%{_includedir}/libqhullcpp/
%{_libdir}/libqhull_r.so
%{_libdir}/cmake/Qhull
-%{_libdir}/pkgconfig/qhull*pc
+%{_libdir}/pkgconfig/qhull_r.pc
+
+%files -n qhullcpp-devel-static
+%{_includedir}/libqhullcpp/
+%{_libdir}/libqhullcpp.a
+%{_libdir}/pkgconfig/qhullcpp.pc
%changelog
