Emergency tweak

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patterns-base?expand=0&rev=2

patterns-base.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package patterns-openSUSE
+# spec file for package patterns-base
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -29,7 +29,6 @@ Source0:        %{name}-rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  patterns-rpm-macros
 
-
 %description
 This is an internal package that is used to create the patterns as part
 of the installation source setup.  Installation of this package does
@@ -43,10 +42,10 @@ This particular package contains all the base / core patterns (and those that do
 %pattern_basetechnologies
 Summary:        32-Bit Runtime Environment
 Group:          Metapackages
+Provides:       patterns-openSUSE-32bit = %{version}
 Provides:       pattern() = 32bit
 Provides:       pattern-icon() = yast-misc
 Provides:       pattern-order() = 1140
-Provides:       patterns-openSUSE-32bit = %{version}
 Obsoletes:      patterns-openSUSE-32bit < %{version}
 
 %description 32bit
@@ -62,11 +61,11 @@ This pattern installs the 32-bit variant of all selected patterns, allowing you
 %pattern_basetechnologies
 Summary:        64-Bit Runtime Environment
 Group:          Metapackages
+Provides:       patterns-openSUSE-64bit = %{version}
 Provides:       pattern() = 64bit
 Provides:       pattern-icon() = yast-misc
 Provides:       pattern-order() = 1160
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-64bit = %{version}
 Obsoletes:      patterns-openSUSE-64bit < %{version}
 
 %description 64bit
@@ -82,11 +81,11 @@ This pattern installs the 64-bit variant of all selected patterns, allowing you
 %pattern_basetechnologies
 Summary:        AppArmor
 Group:          Metapackages
+Provides:       patterns-openSUSE-apparmor = %{version}
 Provides:       pattern() = apparmor
 Provides:       pattern-icon() = pattern-apparmor
 Provides:       pattern-order() = 1100
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-apparmor = %{version}
 Obsoletes:      patterns-openSUSE-apparmor < %{version}
 Requires:       pattern() = basesystem
 Recommends:     pattern() = apparmor_opt
@@ -112,11 +111,11 @@ AppArmor is an application security framework that provides mandatory access con
 %pattern_basetechnologies
 Summary:        AppArmor
 Group:          Metapackages
+Provides:       patterns-openSUSE-apparmor_opt = %{version}
 Provides:       pattern() = apparmor_opt
 Provides:       pattern-extends() = apparmor
 Provides:       pattern-icon() = apparmor%2Fapp_armor.png
 Provides:       pattern-order() = 1080
-Provides:       patterns-openSUSE-apparmor_opt = %{version}
 Obsoletes:      patterns-openSUSE-apparmor_opt < %{version}
 Requires:       pattern() = basesystem
 
@@ -135,24 +134,24 @@ AppArmor is an application security framework that provides mandatory access con
 %pattern_basetechnologies
 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()
-Provides:       patterns-openSUSE-base = %{version}
 Obsoletes:      patterns-openSUSE-base < %{version}
-Requires:       shadow
-Requires:       rpm
 Requires:       kbd
-Requires:       procps
-Requires:       which
-Requires:       util-linux
 Requires:       openSUSE-build-key
 Requires:       openSUSE-release
 Requires:       openssh
 Requires:       polkit
 Requires:       polkit-default-privs
+Requires:       procps
+Requires:       rpm
+Requires:       shadow
+Requires:       util-linux
+Requires:       which
 # Recommend NTP at least until boo#936378 is fixed and YaST is not trying to configure a service that's not there
 Recommends:     ntp
 Recommends:     ca-certificates-mozilla
@@ -197,11 +196,12 @@ This is the base runtime system.  It contains only a minimal multiuser booting s
 %pattern_basetechnologies
 Summary:        Console Tools
 Group:          Metapackages
+Provides:       patterns-openSUSE-console = %{version}
 Provides:       pattern() = console
+Provides:       pattern() = generic_server
 Provides:       pattern-icon() = yast-system
 Provides:       pattern-order() = 1120
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-console = %{version}
 Obsoletes:      patterns-openSUSE-console < %{version}
 
 Requires:       mc
@@ -260,11 +260,11 @@ Applications useful for those using the console and no graphical desktop environ
 %pattern_basetechnologies
 Summary:        Enhanced Base System
 Group:          Metapackages
+Provides:       patterns-openSUSE-enhanced_base = %{version}
 Provides:       pattern() = enhanced_base
 Provides:       pattern-icon() = pattern-basis
 Provides:       pattern-order() = 1060
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-enhanced_base = %{version}
 Obsoletes:      patterns-openSUSE-enhanced_base < %{version}
 Requires:       pattern() = base
 Requires:       pattern() = basesystem
@@ -452,11 +452,11 @@ This is the enhanced base runtime system with lots of convenience packages.
 %pattern_basetechnologies
 Summary:        Enhanced Base System
 Group:          Metapackages
+Provides:       patterns-openSUSE-enhanced_base_opt = %{version}
 Provides:       pattern() = enhanced_base_opt
 Provides:       pattern-extends() = enhanced_base
 Provides:       pattern-icon() = yast-software
 Provides:       pattern-order() = 1040
-Provides:       patterns-openSUSE-enhanced_base_opt = %{version}
 Obsoletes:      patterns-openSUSE-enhanced_base_opt < %{version}
 
 Recommends:     at
@@ -558,11 +558,11 @@ This is the enhanced base runtime system with lots of convenience packages.
 %pattern_basetechnologies
 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
-Provides:       patterns-openSUSE-minimal_base = %{version}
 Obsoletes:      patterns-openSUSE-minimal_base < %{version}
 Recommends:     pattern() = minimal_base-conflicts
 
@@ -630,10 +630,10 @@ This is the minimal openSUSE runtime system. It is really a minimal system, you
 %pattern_basetechnologies
 Summary:        Base System
 Group:          Metapackages
+Provides:       patterns-openSUSE-minimal_base-conflicts = %{version}
 Provides:       pattern() = minimal_base-conflicts
 Provides:       pattern-icon() = yast-sw_single
 Provides:       pattern-order() = 5191
-Provides:       patterns-openSUSE-minimal_base-conflicts = %{version}
 Obsoletes:      patterns-openSUSE-minimal_base-conflicts < %{version}
 Requires:       pattern() = minimal_base
 
@@ -697,11 +697,11 @@ This is the base runtime system.  It contains only a minimal multiuser booting s
 %pattern_basetechnologies
 Summary:        Software Management
 Group:          Metapackages
+Provides:       patterns-openSUSE-sw_management = %{version}
 Provides:       pattern() = sw_management
 Provides:       pattern-icon() = yast-sw_single
 Provides:       pattern-order() = 1360
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-sw_management = %{version}
 Obsoletes:      patterns-openSUSE-sw_management < %{version}
 Recommends:     pattern() = sw_management_x11
 # Zypper is the basic sw_management stack for *SUSE
@@ -720,11 +720,11 @@ This pattern provides a graphical application and a command line tool for keepin
 %pattern_basetechnologies
 Summary:        Tests for the Update Stack
 Group:          Metapackages
+Provides:       patterns-openSUSE-update_test = %{version}
 Provides:       pattern() = update_test
 Provides:       pattern-icon() = yast-update
 Provides:       pattern-order() = 1380
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-update_test = %{version}
 Obsoletes:      patterns-openSUSE-update_test < %{version}
 
 Recommends:     update-test-trival
@@ -751,11 +751,11 @@ Packages used for testing that the update stack works.  These tiny packages do n
 %pattern_graphicalenvironments
 Summary:        X Window System
 Group:          Metapackages
+Provides:       patterns-openSUSE-x11 = %{version}
 Provides:       pattern() = x11
 Provides:       pattern-icon() = yast-x11
 Provides:       pattern-order() = 1800
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-x11 = %{version}
 Obsoletes:      patterns-openSUSE-x11 < %{version}
 Requires:       pattern() = basesystem
 Requires:       pattern() = enhanced_base
@@ -833,11 +833,11 @@ The X Window System provides the only standard platform-independent networked gr
 %pattern_graphicalenvironments
 Summary:        X Window System
 Group:          Metapackages
+Provides:       patterns-openSUSE-x11_opt = %{version}
 Provides:       pattern() = x11_opt
 Provides:       pattern-extends() = x11
 Provides:       pattern-icon() = yast-x11
 Provides:       pattern-order() = 1680
-Provides:       patterns-openSUSE-x11_opt = %{version}
 Obsoletes:      patterns-openSUSE-x11_opt < %{version}
 Requires:       pattern() = basesystem
 Requires:       pattern() = enhanced_base
@@ -869,11 +869,11 @@ The X Window System provides the only standard platform-independent networked gr
 %pattern_basetechnologies
 Summary:        x86 Runtime Environment
 Group:          Metapackages
+Provides:       patterns-openSUSE-x86 = %{version}
 Provides:       pattern() = x86
 Provides:       pattern-icon() = yast-misc
 Provides:       pattern-order() = 1180
 Provides:       pattern-visible()
-Provides:       patterns-openSUSE-x86 = %{version}
 Obsoletes:      patterns-openSUSE-x86 < %{version}
 
 %description x86