From 51ab44ad1e4134414927ff633d07c24906dd33bb1b4c12378d7fc9afc3ee806f Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Thu, 26 Oct 2017 12:17:25 +0000 Subject: [PATCH] Accepting request 536738 from home:dimstar:Factory - Add conflict between the -devel-doc variants. - Add conflict between the -devel-doc variants. OBS-URL: https://build.opensuse.org/request/show/536738 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=105 --- vtk-compat_gl.changes | 5 +++++ vtk-compat_gl.spec | 4 ++++ vtk.changes | 5 +++++ vtk.spec | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index 3786913..a030baf 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 26 08:48:16 UTC 2017 - dimstar@opensuse.org + +- Add conflict between the -devel-doc variants. + ------------------------------------------------------------------- Tue Oct 24 11:55:17 UTC 2017 - dimstar@opensuse.org diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index 8865b3a..77787a0 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -183,6 +183,10 @@ use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation Group: Documentation/HTML +%if %compat_gl +# vtk and vtk-compat_gl have the same set of documentation. +Conflicts: vtk-devel-doc +%endif %description devel-doc VTK is a software system for image processing, 3D graphics, volume diff --git a/vtk.changes b/vtk.changes index 3786913..a030baf 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 26 08:48:16 UTC 2017 - dimstar@opensuse.org + +- Add conflict between the -devel-doc variants. + ------------------------------------------------------------------- Tue Oct 24 11:55:17 UTC 2017 - dimstar@opensuse.org diff --git a/vtk.spec b/vtk.spec index c5c7bbe..ff4a537 100644 --- a/vtk.spec +++ b/vtk.spec @@ -183,6 +183,10 @@ use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation Group: Documentation/HTML +%if %compat_gl +# vtk and vtk-compat_gl have the same set of documentation. +Conflicts: vtk-devel-doc +%endif %description devel-doc VTK is a software system for image processing, 3D graphics, volume