Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2015-06-30 10:16:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-06-24 20:49:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2015-06-30 10:16:13.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 25 08:17:04 UTC 2015 - [email protected] + +- use qt5 for factory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.2vIUJR/_old 2015-06-30 10:16:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2vIUJR/_new 2015-06-30 10:16:14.000000000 +0200 @@ -55,17 +55,27 @@ BuildRequires: libmysqlclient-devel BuildRequires: libnetcdf_c++-devel BuildRequires: libpng-devel -BuildRequires: libqt4-devel BuildRequires: libtheora-devel BuildRequires: libtiff-devel BuildRequires: netcdf-devel BuildRequires: openmpi-devel BuildRequires: python-devel -BuildRequires: python-qt4-devel + BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: wget BuildRequires: zlib-devel +%if 0%{?suse_version} > 1320 +BuildRequires: python-qt5-devel +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5OpenGLExtensions) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) +%else +BuildRequires: libqt4-devel +BuildRequires: python-qt4-devel +%endif %if %{?sles_version} BuildRequires: libxml2-devel %else @@ -76,7 +86,11 @@ BuildRequires: jsoncpp-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1320 +%define qtdir %{_lib}/qt5 +%else %define qtdir %{_lib}/qt4 +%endif %description VTK is an open-source software system for image processing, 3D @@ -106,7 +120,6 @@ Requires: libnetcdf_c++-devel Requires: libogg-devel Requires: libpng-devel -Requires: libqt4-devel Requires: libtheora-devel Requires: libtiff-devel Requires: libxml2-devel @@ -160,7 +173,17 @@ Requires: %{name} = %{version} Requires: %{name}-qt = %{version} Requires: python-%{name} = %{version} +%if 0%{?suse_version} > 1320 +Requires: libQt5OpenGL-devel +Requires: libQt5OpenGLExtensions-devel-static +Requires: libQt5Sql-devel +Requires: libQt5WebKitWidgets-devel +Requires: libQt5Widgets-devel +Requires: python-qt5 +%else +Requires: libqt4-devel Requires: python-qt4 +%endif %{py_requires} %description -n python-%{name}-qt @@ -260,6 +283,9 @@ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name}\ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{name} \ -DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{name} \ +%if 0%{?suse_version} > 1320 + -DVTK_QT_VERSION=5 \ +%endif -DVTK_INSTALL_QT_DIR:STRING=/%{qtdir}/plugins/designer \ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \ -DVTK_USE_RENDERING:BOOL=ON \
