From c7bf13d61ae24574c70eedd4909a1a5db66a877a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 27 Jun 2023 14:57:49 +0100 Subject: [PATCH] Add conflicts tag for tbb-doc (#2174300) Also remove outdated provides for bundled(jquery), which is no longer present in the package. --- tbb.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tbb.spec b/tbb.spec index 7becbeb..2753477 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,7 +1,7 @@ Name: tbb Summary: The Threading Building Blocks library abstracts low-level threading details Version: 2020.3 -Release: 17%{?dist} +Release: 18%{?dist} License: ASL 2.0 URL: http://threadingbuildingblocks.org/ @@ -66,7 +66,10 @@ Blocks (TBB) C++ libraries. %package doc Summary: The Threading Building Blocks documentation -Provides: bundled(jquery) +%ifarch %{ix86} +# https://bugzilla.redhat.com/show_bug.cgi?id=2174300 +Conflicts: %{name}-doc.x86_64 +%endif %description doc PDF documentation for the user of the Threading Building Block (TBB) @@ -211,6 +214,10 @@ cmake \ %{python3_sitearch}/__pycache__/TBB* %changelog +* Tue Jun 27 2023 Jonathan Wakely - 2020.3-18 +- Add conflicts tag for tbb-doc (#2174300) +- Remove outdated provides for bundled(jquery) + * Tue Jun 13 2023 Python Maint - 2020.3-17 - Rebuilt for Python 3.12