commit qhull for openSUSE:Factory
Hello community, here is the log from the commit of package qhull for openSUSE:Factory checked in at 2020-11-02 09:40:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qhull (Old) and /work/SRC/openSUSE:Factory/.qhull.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qhull" Mon Nov 2 09:40:38 2020 rev:20 rq:844901 version:2020.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qhull/qhull.changes 2020-07-14 07:58:08.889567881 +0200 +++ /work/SRC/openSUSE:Factory/.qhull.new.3463/qhull.changes 2020-11-02 09:40:45.597631031 +0100 @@ -1,0 +2,14 @@ +Fri Oct 23 16:27:02 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de> + +- updated to 2020.2 (8.0.2): + * Qhull 202.2 updates Qhull's builds and Qhull's C++ interface. + See https://github.com/qhull/qhull/wiki for details. +- updated to 2020.1 (8.0.2): + * Qhull 2020.1 enhances the C++ interface with QhullUser and + support for Voronoi diagrams. See user_eg3 for C++ examples. + * Qhull builds support pkg-config, SONAME, DESTDIR for staged + installs, PREFIX, QhullExport, and CMAKE_CURRENT_SOURCE_DIR. +- Drop 0001-Allow-disabling-of-static-or-shared-library-builds.patch +- Rebase 0002-Remove-tools-from-CMake-exported-targets.patch + +------------------------------------------------------------------- Old: ---- 0001-Allow-disabling-of-static-or-shared-library-builds.patch qhull-2019-src-7.3.2.tgz New: ---- qhull-2020-src-8.0.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qhull.spec ++++++ --- /var/tmp/diff_new_pack.VqjDDZ/_old 2020-11-02 09:40:46.681632071 +0100 +++ /var/tmp/diff_new_pack.VqjDDZ/_new 2020-11-02 09:40:46.685632074 +0100 @@ -16,19 +16,17 @@ # -%define sonum 7 -%define srcyear 2019 -%define srcver 7.3.2 +%define libname libqhull_r8_0 +%define srcyear 2020 +%define srcver 8.0.2 Name: qhull -Version: 2019.1 +Version: 2020.2 Release: 0 Summary: Computing convex hulls, Delaunay triangulations and Voronoi diagrams License: Qhull Group: Development/Libraries/C and C++ URL: http://www.qhull.org Source0: http://www.qhull.org/download/qhull-%{srcyear}-src-%{srcver}.tgz -# PATCH-FIX-UPSTREAM -- https://github.com/qhull/qhull/pull/69 -Patch0: 0001-Allow-disabling-of-static-or-shared-library-builds.patch # PATCH-FIX-OPENSUSE Patch1: 0002-Remove-tools-from-CMake-exported-targets.patch BuildRequires: cmake @@ -46,15 +44,11 @@ non-convex surfaces, mesh generation of non-convex objects, or medium-sized inputs in 9-D and higher. -%package -n libqhull%{sonum} +%package -n %{libname} Summary: Computing convex hulls, Delaunay triangulations and Voronoi diagrams -# Bad naming of old packages, conflicts on the file level (libqhull.so.7) Group: System/Libraries -Obsoletes: libqhull%{sonum}-7_3_2 < %{version}-%{release} -Provides: libqhull%{sonum}-7_3_2 = %{version}-%{release} -Obsoletes: libqhull%{sonum}-7_2_0 < %{version} -%description -n libqhull%{sonum} +%description -n %{libname} Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, halfspace intersection about a point, furthest-site Delaunay triangulation, and furthest-site Voronoi diagram. The source code runs in 2D @@ -69,7 +63,7 @@ %package devel Summary: Development and documentation files for qhull Group: Development/Libraries/C and C++ -Requires: libqhull%{sonum} = %{version} +Requires: %{libname} = %{version} %description devel Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, @@ -80,7 +74,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %build @@ -90,21 +83,22 @@ -DLIB_INSTALL_DIR="%{_lib}" \ -DBIN_INSTALL_DIR="%{_bindir}" \ -DMAN_INSTALL_DIR="%{_mandir}/man1/" -%make_jobs +%cmake_build %install %cmake_install # Fixup wrong location %if "%{_lib}" != "lib" mv %{buildroot}%{_prefix}/lib/cmake %{buildroot}%{_libdir}/ +mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_libdir}/ %endif +rm %{buildroot}%{_docdir}/%{name}/COPYING.txt -%post -n libqhull%{sonum} -p /sbin/ldconfig -%postun -n libqhull%{sonum} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files %license COPYING.txt -%doc src/Changes.txt %{_docdir}/%{name}/ %{_bindir}/qconvex %{_bindir}/qdelaunay @@ -114,23 +108,16 @@ %{_bindir}/rbox %{_mandir}/man1/* -%files -n libqhull%{sonum} +%files -n %{libname} %license COPYING.txt -%{_libdir}/libqhull.so.%{sonum} -%{_libdir}/libqhull.so.%{srcver} -%{_libdir}/libqhull_p.so.%{sonum} -%{_libdir}/libqhull_p.so.%{srcver} -%{_libdir}/libqhull_r.so.%{sonum} -%{_libdir}/libqhull_r.so.%{srcver} +%{_libdir}/libqhull_r.so.* %files devel -%license COPYING.txt %{_includedir}/libqhull/ %{_includedir}/libqhull_r/ %{_includedir}/libqhullcpp/ -%{_libdir}/libqhull.so -%{_libdir}/libqhull_p.so %{_libdir}/libqhull_r.so %{_libdir}/cmake/Qhull +%{_libdir}/pkgconfig/qhull*pc %changelog ++++++ 0002-Remove-tools-from-CMake-exported-targets.patch ++++++ --- /var/tmp/diff_new_pack.VqjDDZ/_old 2020-11-02 09:40:46.705632094 +0100 +++ /var/tmp/diff_new_pack.VqjDDZ/_new 2020-11-02 09:40:46.705632094 +0100 @@ -21,8 +21,8 @@ # Define install # --------------------------------------- --set(qhull_TARGETS_INSTALL ${qhull_TARGETS_TOOLS}) -+install(TARGETS ${qhull_TARGETS_TOOLS} EXPORT +-set(qhull_TARGETS_INSTALL ${qhull_TARGETS_APPLICATIONS}) ++install(TARGETS ${qhull_TARGETS_APPLICATIONS} EXPORT + RUNTIME DESTINATION ${BIN_INSTALL_DIR}) + if (BUILD_SHARED_LIBS) ++++++ qhull-2019-src-7.3.2.tgz -> qhull-2020-src-8.0.2.tgz ++++++ ++++ 39059 lines of diff (skipped)
participants (1)
-
root