Hello community, here is the log from the commit of package cgal for openSUSE:Factory checked in at 2019-04-08 10:38:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cgal (Old) and /work/SRC/openSUSE:Factory/.cgal.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cgal" Mon Apr 8 10:38:29 2019 rev:19 rq:691910 version:4.14 Changes: -------- --- /work/SRC/openSUSE:Factory/cgal/cgal.changes 2018-10-04 19:01:06.499227664 +0200 +++ /work/SRC/openSUSE:Factory/.cgal.new.3908/cgal.changes 2019-04-08 10:40:13.427293789 +0200 @@ -1,0 +2,27 @@ +Fri Apr 5 15:51:37 UTC 2019 - Stefan Brüns <[email protected]> + +- Add Conflicts between libCGAL_core and old unsplit package, both + provide the same library file. + +------------------------------------------------------------------- +Thu Apr 4 01:23:23 UTC 2019 - Stefan Brüns <[email protected]> + +- Split library package into 4 subpackages, libCGAL, libCGAL_Core + libCGAL_ImageIO and libCGAL_Qt5, to properly adhere to the + Shared Libraray Packaging policy, versions are no longer in sync. +- Add bcond for Qt5 component. It requires Qt5 built with Desktop + OpenGL support, which is not available on ARM and Aarch64. +- Remove fdupes filter from rpmlintrc, not required any more. + +------------------------------------------------------------------- +Mon Apr 1 08:51:07 UTC 2019 - [email protected] + +- Update to 4.14: + * new 2D Periodic Hyperbolic Triangulations + * new 2D Hyperbolic Triangulations + * new The Heat Method + * new Triangulated Surface Mesh Approximation + * For bugfixes and details see: + https://www.cgal.org/2019/03/29/cgal414/ + +------------------------------------------------------------------- Old: ---- CGAL-4.13-doc_html.tar.xz CGAL-4.13.tar.xz New: ---- CGAL-4.14-doc_html.tar.xz CGAL-4.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cgal.spec ++++++ --- /var/tmp/diff_new_pack.Uxe9PV/_old 2019-04-08 10:40:15.739294352 +0200 +++ /var/tmp/diff_new_pack.Uxe9PV/_new 2019-04-08 10:40:15.763294357 +0200 @@ -1,7 +1,7 @@ # # spec file for package cgal # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. # # All modifications and additions to the file contributed by third parties @@ -13,20 +13,34 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# Disable Qt5 for embedded platforms, QOpenGlFunctions_2_1 is not available with GLES +%ifarch %arm aarch64 +%bcond_with qt5 +%else +%bcond_without qt5 +%endif -# #@TODO : clarify and split licence correctly, GPL & LGPL 3+ version #@TODO : split package in coherent parts #@TODO : rename parts (inspirated by sfcgal packaging) #@TODO : ask for rename and take into account the obsolete existant thing. like libcgal deps + +# soversions, according to Installation/CMakeLists.txt +# CGAL-4.14 : 14.0.0 , but only for CGAL_ImageIO (ABI broken in CGAL::Image_3.) +# and for CGAL_Qt5 (ABI broken in DemoMainWindow) +# CGAL-4.14 : 13.0.3 , for other libraries %define _sover 13 +%define _sover_Core 13 +%define _sover_ImageIO 14 +%define _sover_Qt5 14 + %define _sourcename CGAL -%define _libname libCGAL%{_sover} +%define _libname() libCGAL%{?1}%{?2}%{expand:%{_sover%{?1}}} Name: cgal -Version: 4.13 +Version: 4.14 Release: 0 Summary: Computational Geometry Algorithms Library License: GPL-3.0-or-later AND LGPL-3.0-or-later @@ -43,14 +57,15 @@ BuildRequires: glu-devel BuildRequires: gmp-devel BuildRequires: lapack-devel -BuildRequires: libQt5OpenGL-devel >= 5.3 BuildRequires: libboost_atomic-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel -BuildRequires: libqt5-qtbase-devel >= 5.3 -BuildRequires: libqt5-qtscript-devel >= 5.3 -BuildRequires: libqt5-qtsvg-devel >= 5.3 -BuildRequires: libqt5-qttools-devel >= 5.3 +%if %{with qt5} +BuildRequires: cmake(Qt5) >= 5.3 +BuildRequires: cmake(Qt5OpenGL) >= 5.3 +BuildRequires: cmake(Qt5Svg) >= 5.3 +BuildRequires: cmake(Qt5Xml) >= 5.3 +%endif BuildRequires: mpfr-devel BuildRequires: xz BuildRequires: zlib-devel @@ -79,13 +94,64 @@ volume mesh generation, geometry processing, alpha shapes, convex hull algorithms, shape analysis, AABB and KD trees. +%package -n %{_libname _Core} +Summary: Computational Geometry Algorithms Library +License: GPL-3.0-or-later AND LGPL-3.0-or-later +Group: System/Libraries +# Required after package split, remove on sover bump +Conflicts: %{_libname} < %{version} + +%description -n %{_libname _Core} +CGAL provides geometric algorithms in a C++ library. + +The library offers data structures and algorithms like +triangulations, Voronoi diagrams, Boolean operations on polygons and +polyhedra, point set processing, arrangements of curves, surface and +volume mesh generation, geometry processing, alpha shapes, convex +hull algorithms, shape analysis, AABB and KD trees. + +%package -n %{_libname _ImageIO} +Summary: Computational Geometry Algorithms Library +License: GPL-3.0-or-later AND LGPL-3.0-or-later +Group: System/Libraries + +%description -n %{_libname _ImageIO} +CGAL provides geometric algorithms in a C++ library. + +The library offers data structures and algorithms like +triangulations, Voronoi diagrams, Boolean operations on polygons and +polyhedra, point set processing, arrangements of curves, surface and +volume mesh generation, geometry processing, alpha shapes, convex +hull algorithms, shape analysis, AABB and KD trees. + +%package -n %{_libname _Qt5 - } +Summary: Computational Geometry Algorithms Library +License: GPL-3.0-or-later AND LGPL-3.0-or-later +Group: System/Libraries + +%description -n %{_libname _Qt5 - } +CGAL provides geometric algorithms in a C++ library. + +The library offers data structures and algorithms like +triangulations, Voronoi diagrams, Boolean operations on polygons and +polyhedra, point set processing, arrangements of curves, surface and +volume mesh generation, geometry processing, alpha shapes, convex +hull algorithms, shape analysis, AABB and KD trees. + %package devel Summary: Development files and tools for CGAL applications License: GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0 Group: Development/Libraries/C and C++ Requires: %{_libname} = %{version} +Requires: %{_libname _Core} = %{version} +Requires: %{_libname _ImageIO} = %{version} +%if %{with qt5} +Requires: %{_libname _Qt5 - } = %{version} +%endif Requires: blas -Requires: boost-devel +Requires: libboost_atomic-devel +Requires: libboost_system-devel +Requires: libboost_thread-devel Requires: cmake Requires: gmp-devel Requires: lapack @@ -158,14 +224,27 @@ %post -n %{_libname} -p /sbin/ldconfig %postun -n %{_libname} -p /sbin/ldconfig +%post -n %{_libname _Core} -p /sbin/ldconfig +%postun -n %{_libname _Core} -p /sbin/ldconfig +%post -n %{_libname _Qt5 - } -p /sbin/ldconfig +%postun -n %{_libname _Qt5 - } -p /sbin/ldconfig +%post -n %{_libname _ImageIO} -p /sbin/ldconfig +%postun -n %{_libname _ImageIO} -p /sbin/ldconfig %files -n %{_libname} %license LICENSE* -%doc AUTHORS CHANGES.md %{_libdir}/libCGAL.so.%{_sover}* -%{_libdir}/libCGAL_Core.so.%{_sover}* -%{_libdir}/libCGAL_ImageIO.so.%{_sover}* -%{_libdir}/libCGAL_Qt5.so.%{_sover}* + +%files -n %{_libname _Core} +%{_libdir}/libCGAL_Core.so.%{_sover_Core}* + +%files -n %{_libname _ImageIO} +%{_libdir}/libCGAL_ImageIO.so.%{_sover_ImageIO}* + +%if %{with qt5} +%files -n %{_libname _Qt5 - } +%{_libdir}/libCGAL_Qt5.so.%{_sover_Qt5}* +%endif %files devel %license LICENSE* @@ -174,14 +253,15 @@ %{_libdir}/libCGAL.so %{_libdir}/libCGAL_Core.so %{_libdir}/libCGAL_ImageIO.so +%if %{with qt5} %{_libdir}/libCGAL_Qt5.so +%endif %{_libdir}/cmake/CGAL %{_bindir}/* %{_mandir}/man1/cgal_create_cmake_script.1%{?ext_man} %files demo-examples-devel %license LICENSE* -%doc AUTHORS CHANGES.md %{_datadir}/CGAL %files doc ++++++ CGAL-4.13-doc_html.tar.xz -> CGAL-4.14-doc_html.tar.xz ++++++ /work/SRC/openSUSE:Factory/cgal/CGAL-4.13-doc_html.tar.xz /work/SRC/openSUSE:Factory/.cgal.new.3908/CGAL-4.14-doc_html.tar.xz differ: char 27, line 1 ++++++ CGAL-4.13-doc_html.tar.xz -> CGAL-4.14.tar.xz ++++++ /work/SRC/openSUSE:Factory/cgal/CGAL-4.13-doc_html.tar.xz /work/SRC/openSUSE:Factory/.cgal.new.3908/CGAL-4.14.tar.xz differ: char 25, line 1 ++++++ cgal-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.Uxe9PV/_old 2019-04-08 10:40:15.915294395 +0200 +++ /var/tmp/diff_new_pack.Uxe9PV/_new 2019-04-08 10:40:15.915294395 +0200 @@ -6,7 +6,3 @@ # So sources are pure addFilter("W: zero-length /usr/share/CGAL/examples/Surface_mesher/skip_vcproj_auto_generation") addFilter("W: zero-length /usr/share/CGAL/examples/Ridges_3/skip_vcproj_auto_generation") - - -# Add a filter cause we don't know why after having done 2x %fdupes there's still those -addFilter("W: files-duplicate")
