From 18e913398a10e901675432a655e166db21f9bb19dc5c267aa158a08cb85faec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 25 Jun 2015 09:53:01 +0000 Subject: [PATCH] Accepting request 313653 from home:ealin:branches:science - use qt5 for factory OBS-URL: https://build.opensuse.org/request/show/313653 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=58 --- vtk.changes | 5 +++++ vtk.spec | 32 +++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/vtk.changes b/vtk.changes index 7bbd2aa..8055d29 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 25 08:17:04 UTC 2015 - alinm.elena@gmail.com + +- use qt5 for factory + ------------------------------------------------------------------- Mon Jun 22 18:00:32 UTC 2015 - olaf@aepfle.de diff --git a/vtk.spec b/vtk.spec index aae650b..0f8b9c6 100644 --- a/vtk.spec +++ b/vtk.spec @@ -55,17 +55,27 @@ BuildRequires: libjpeg-devel 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: pkgconfig(libxml-2.0) 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: libmysqlclient-devel 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 @@ Group: System/Libraries 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 @@ cmake .. \ -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 \