From ec10b2fc5037e2c00e4521bc23f4de929dc352d35414107162bb2eb425511854 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 8 Jun 2017 13:18:41 +0000
Subject: [PATCH] - Cleanup patterns: a pattern definition is not allowed to
 have   multiple Provides: patter() = FOO, as only one of them is seen   by
 libsolv.

OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=24
---
 patterns-base.changes | 7 +++++++
 patterns-base.spec    | 9 ++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/patterns-base.changes b/patterns-base.changes
index 9014eeb..7004254 100644
--- a/patterns-base.changes
+++ b/patterns-base.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun  8 13:17:51 UTC 2017 - dimstar@opensuse.org
+
+- Cleanup patterns: a pattern definition is not allowed to have
+  multiple Provides: patter() = FOO, as only one of them is seen
+  by libsolv.
+
 -------------------------------------------------------------------
 Thu Jun  8 09:49:25 UTC 2017 - dimstar@opensuse.org
 
diff --git a/patterns-base.spec b/patterns-base.spec
index b6cb216..736c3bd 100644
--- a/patterns-base.spec
+++ b/patterns-base.spec
@@ -87,7 +87,7 @@ Provides:       pattern-icon() = pattern-apparmor
 Provides:       pattern-order() = 1100
 Provides:       pattern-visible()
 Obsoletes:      patterns-openSUSE-apparmor < %{version}
-Requires:       pattern() = basesystem
+Requires:       pattern() = base
 Recommends:     pattern() = apparmor_opt
 
 Requires:       apparmor-abstractions
@@ -117,7 +117,7 @@ Provides:       pattern-extends() = apparmor
 Provides:       pattern-icon() = apparmor%2Fapp_armor.png
 Provides:       pattern-order() = 1080
 Obsoletes:      patterns-openSUSE-apparmor_opt < %{version}
-Requires:       pattern() = basesystem
+Requires:       pattern() = base
 
 Requires:       apparmor-docs
 
@@ -136,7 +136,6 @@ Summary:        Base System
 Group:          Metapackages
 Provides:       patterns-openSUSE-base = %{version}
 Provides:       pattern() = base
-Provides:       pattern() = basesystem
 Provides:       pattern-icon() = pattern-basis
 Provides:       pattern-order() = 1020
 Provides:       pattern-visible()
@@ -267,7 +266,6 @@ Provides:       pattern-order() = 1060
 Provides:       pattern-visible()
 Obsoletes:      patterns-openSUSE-enhanced_base < %{version}
 Requires:       pattern() = base
-Requires:       pattern() = basesystem
 Recommends:     pattern() = apparmor
 Recommends:     pattern() = yast2_basis
 Recommends:     pattern() = enhanced_base_opt
@@ -552,7 +550,6 @@ This is the enhanced base runtime system with lots of convenience packages.
 Summary:        Base System
 Group:          Metapackages
 Provides:       patterns-openSUSE-minimal_base = %{version}
-Provides:       pattern() = basesystem
 Provides:       pattern() = minimal_base
 Provides:       pattern-icon() = yast-sw_single
 Provides:       pattern-order() = 5190
@@ -751,7 +748,6 @@ Provides:       pattern-icon() = yast-x11
 Provides:       pattern-order() = 1800
 Provides:       pattern-visible()
 Obsoletes:      patterns-openSUSE-x11 < %{version}
-Requires:       pattern() = basesystem
 Requires:       pattern() = enhanced_base
 Requires:       pattern() = fonts
 Recommends:     pattern() = x11_opt
@@ -833,7 +829,6 @@ Provides:       pattern-extends() = x11
 Provides:       pattern-icon() = yast-x11
 Provides:       pattern-order() = 1680
 Obsoletes:      patterns-openSUSE-x11_opt < %{version}
-Requires:       pattern() = basesystem
 Requires:       pattern() = enhanced_base
 Requires:       pattern() = fonts