Hello community, here is the log from the commit of package CSXCAD for openSUSE:Factory checked in at 2016-04-30 23:29:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/CSXCAD (Old) and /work/SRC/openSUSE:Factory/.CSXCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "CSXCAD" Changes: -------- --- /work/SRC/openSUSE:Factory/CSXCAD/CSXCAD.changes 2015-11-26 17:01:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.CSXCAD.new/CSXCAD.changes 2016-04-30 23:29:10.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Mar 12 20:55:07 UTC 2016 - [email protected] + +- Fix building against VTK7 CSXCAD-vtk7.patch + +------------------------------------------------------------------- New: ---- CSXCAD-vtk7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.jWaKDl/_old 2016-04-30 23:29:11.000000000 +0200 +++ /var/tmp/diff_new_pack.jWaKDl/_new 2016-04-30 23:29:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package CSXCAD # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,9 +19,9 @@ Name: CSXCAD %define octpkg csxcad Version: 0.6.0 +Release: 0 %define so_ver 0 %define libname lib%{name}%{so_ver} -Release: 0 Summary: A C++ library to describe geometrical objects and their properties License: LGPL-3.0 Group: System/Libraries @@ -37,6 +37,8 @@ Patch4: CSXCAD-octave-AppCSXCAD-load.patch # PATCH-FIX-OPENSUSE CSXCAD-readme-octave-package.patch -- Add correct instruction about Octave and MATLAB packages Patch5: CSXCAD-readme-octave-package.patch +# PATCH-FIX-OPENSUSE CSXCAD-vtk7.patch -- Fix build against vtk7 +Patch6: CSXCAD-vtk7.patch BuildRequires: boost-devel BuildRequires: cgal-devel BuildRequires: cmake @@ -102,6 +104,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 cat > DESCRIPTION << 'EOF' Name: %{octpkg} ++++++ CSXCAD-vtk7.patch ++++++ Index: CSXCAD-0.6.0/CMakeLists.txt =================================================================== --- CSXCAD-0.6.0.orig/CMakeLists.txt +++ CSXCAD-0.6.0/CMakeLists.txt @@ -122,6 +122,10 @@ include(${VTK_USE_FILE}) INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIR}) if("${VTK_MAJOR_VERSION}" EQUAL 6) set( vtk_LIBS ${VTK_LIBRARIES} ) +elseif ("${VTK_MAJOR_VERSION}" EQUAL 7) + set( vtk_LIBS + vtkCommonCore + ) else() set( vtk_LIBS vtkCommon
