commit vtk for openSUSE:Factory
Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2017-01-29 10:33:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vtk" Changes: -------- --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2016-08-13 18:31:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2017-02-03 20:04:51.588453168 +0100 @@ -1,0 +2,17 @@ +Wed Nov 23 10:28:02 UTC 2016 - badshah400@gmail.com + +- Update to version 7.1.0: See news item at + https://blog.kitware.com/kitware-plans-to-spotlight-new-vtk-and-paraview-rel... +- Drop patch vtk-gcc6.patch, upstreamed. +- Turn off usage of system DIY2, this library is not yet packaged + for openSUSE. +- Disable mkg3states binary also for openSUSE:Leap versions. +- Update file list for upstream installation changes. +- Use bundled gl2ps, as it no longer builds against the system + one (requires svn trunk version of gl2ps). +- CMake >= 3.4 is now required (earlier versions don't support + NAMES_PER_DIR in find_program). +- Enable use of SYSTEM_LIBRARIES for openSUSE:Leap versions too + (only 13.2 requires this turned off as of now). + +------------------------------------------------------------------- Old: ---- VTK-7.0.0.tar.gz vtk-gcc6.patch New: ---- VTK-7.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.CLCIPI/_old 2017-02-03 20:04:53.084242626 +0100 +++ /var/tmp/diff_new_pack.CLCIPI/_new 2017-02-03 20:04:53.092241501 +0100 @@ -17,9 +17,9 @@ Name: vtk -Version: 7.0.0 +Version: 7.1.0 Release: 0 -%define series 7.0 +%define series 7.1 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -34,13 +34,11 @@ Patch1: vtk-fix-file-contains-date-time.patch # PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386 badshah400@gmail.com -- Fix issues with uintptr_t redefinition by defining the HAVE_UINTPTR_T macro using cmake functions to avoid redefinition of uintptr_t, which is already defined in stdint.h called earlier; patch sent upstream Patch2: vtk-Rinterface-uintptr_t.patch -# PATCH-FIX-UPSTREAM vtk-gcc6.patch dmueller@suse.com -- Fix compilation with GCC >= 6.0 -Patch3: vtk-gcc6.patch BuildRequires: Mesa-libGL-devel BuildRequires: R-base-devel BuildRequires: boost-devel BuildRequires: chrpath -BuildRequires: cmake +BuildRequires: cmake >= 3.4 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: freetype2-devel @@ -84,8 +82,8 @@ %else BuildRequires: pkgconfig(libxml-2.0) %endif -# jsoncpp available for openSUSE > 13.2 -%if 0%{?suse_version} > 1320 +# jsoncpp available for openSUSE > 13.2 & Leap +%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315 BuildRequires: jsoncpp-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -113,8 +111,8 @@ Requires: R-base-devel Requires: gl2ps-devel Requires: hdf5-devel -# jsoncpp available for openSUSE > 13.2 -%if 0%{?suse_version} > 1320 +# jsoncpp available for openSUSE > 13.2 & Leap +%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315 Requires: jsoncpp-devel %endif Requires: freetype2-devel @@ -265,7 +263,6 @@ %setup -q -n VTK-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version} # otherwise it will break on symlinks. @@ -298,7 +295,7 @@ -DVTK_INSTALL_QT_DIR:STRING=/%{qtdir}/plugins/designer \ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \ -DVTK_USE_RENDERING:BOOL=ON \ -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315 -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \ %else -DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \ @@ -323,7 +320,9 @@ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \ -DVTK_PYTHON_VERSION=3 \ - -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON + -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \ + -DVTK_USE_SYSTEM_DIY2=OFF \ + -DVTK_USE_SYSTEM_GL2PS=OFF make %{?_smp_mflags} VERBOSE=1 @@ -419,22 +418,28 @@ %config %{_sysconfdir}/ld.so.conf.d/%{name}.conf %doc Copyright.txt %dir %{_libdir}/%{name}/ +%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 +%{_libdir}/libvtktiff.so.* +%endif %files devel %defattr(-,root,root,-) %{_bindir}/%{name}EncodeString %{_bindir}/%{name}HashSource %{_bindir}/%{name}WrapHierarchy -%if 0%{?suse_version} <= 1320 +%{_bindir}/pvtk +%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 %{_bindir}/%{name}mkg3states %endif %{_datadir}/doc/%{name}-%{series}/ %{_libdir}/%{name}/*.so +%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 +%{_libdir}/libvtktiff.so +%endif %{_libdir}/cmake/%{name}/ %{_libdir}/%{name}/libvtkWrappingTools.a %{_includedir}/%{name}-%{series}/ %{_datadir}/tcl/vtk/vtktcl.c -%{_datadir}/%{name}-%{series}/ %files java %defattr(-,root,root,-) ++++++ VTK-7.0.0.tar.gz -> VTK-7.1.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/vtk/VTK-7.0.0.tar.gz /work/SRC/openSUSE:Factory/.vtk.new/VTK-7.1.0.tar.gz differ: char 5, line 1
participants (1)
-
root@hilbertn.suse.de