openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project1.diff of Package cgal

--- cgal.changes.orig
+++ cgal.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Fri Aug 26 13:10:27 UTC 2022 - Reinhard Max <max@suse.com>
+
+- Get the right gcc version on SLE 15 and Leap 15.
+
+-------------------------------------------------------------------
 Tue Jun  7 18:00:05 UTC 2022 - Michael Vetter <mvetter@suse.com>
 
 - Update to 5.4.1:
--- cgal.spec.orig
+++ cgal.spec
@@ -22,6 +22,11 @@
 #@TODO : rename parts (inspirated by sfcgal packaging)
 #@TODO : ask for rename and take into account the obsolete existant thing. like libcgal deps
 %define _sourcename CGAL
+
+%if 0%{?suse_version} <= 1500
+%define gccver 10
+%endif
+
 Name:           cgal
 Version:        5.4.1
 Release:        0
@@ -35,7 +40,7 @@ Source2:        cgal-rpmlintrc
 BuildRequires:  blas-devel
 BuildRequires:  cmake >= 3.14
 BuildRequires:  fdupes
-BuildRequires:  gcc-c++ >= 10.2.1
+BuildRequires:  gcc%{?gccver}-c++ >= 10.2.1
 BuildRequires:  glu-devel
 BuildRequires:  gmp-devel
 BuildRequires:  lapack-devel
@@ -56,10 +61,9 @@ polyhedra, point set processing, arrange
 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
+License:        BSL-1.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       blas
 Requires:       cmake
@@ -79,7 +83,7 @@ develop applications using CGAL.
 
 %package demo-examples-devel
 Summary:        Example & demo files for CGAL library usage
-License:        GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0 AND MIT
+License:        BSL-1.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
 BuildArch:      noarch
@@ -102,6 +106,10 @@ This package provides the documentation
 %setup -q -n CGAL-%{version} -a1
 
 %build
+%if 0%{?gccver}
+export CC=gcc-%{gccver}
+export CXX=g++-%{gccver}
+%endif
 %cmake -DCGAL_INSTALL_LIB_DIR=%{_lib}
 
 %make_build

Places

File project1.diff of Package cgal

Places