From 9d2060d1ce8fcc3059a29fbca4f7310268a062ee383b426a319a816436f48177 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Wed, 6 Dec 2017 12:48:00 +0000 Subject: [PATCH] Accepting request 548228 from home:bruno_friedmann:branches:science OBS-URL: https://build.opensuse.org/request/show/548228 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=107 --- vtk-compat_gl.changes | 6 ++++++ vtk-compat_gl.spec | 2 +- vtk.changes | 6 ++++++ vtk.spec | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index a030baf..3a95bb1 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 4 18:25:57 UTC 2017 - bruno@ioda-net.ch + +- Move BuildRequires: libQtWebKit-devel (Qt4) inside the else + version < 13.2 + ------------------------------------------------------------------- Thu Oct 26 08:48:16 UTC 2017 - dimstar@opensuse.org diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index 77787a0..0eaa7a3 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -66,7 +66,6 @@ BuildRequires: gnuplot BuildRequires: graphviz BuildRequires: hdf5-devel BuildRequires: java-devel -BuildRequires: libQtWebKit-devel BuildRequires: libX11-devel BuildRequires: libXt-devel BuildRequires: libexpat-devel @@ -95,6 +94,7 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets) %else +BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel BuildRequires: python3-qt4-devel %endif diff --git a/vtk.changes b/vtk.changes index a030baf..3a95bb1 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 4 18:25:57 UTC 2017 - bruno@ioda-net.ch + +- Move BuildRequires: libQtWebKit-devel (Qt4) inside the else + version < 13.2 + ------------------------------------------------------------------- Thu Oct 26 08:48:16 UTC 2017 - dimstar@opensuse.org diff --git a/vtk.spec b/vtk.spec index ff4a537..b6a6835 100644 --- a/vtk.spec +++ b/vtk.spec @@ -66,7 +66,6 @@ BuildRequires: gnuplot BuildRequires: graphviz BuildRequires: hdf5-devel BuildRequires: java-devel -BuildRequires: libQtWebKit-devel BuildRequires: libX11-devel BuildRequires: libXt-devel BuildRequires: libexpat-devel @@ -95,6 +94,7 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets) %else +BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel BuildRequires: python3-qt4-devel %endif