Accepting request 494523 from home:simotek:branches:system:install:head

proper fix for console / generic server

OBS-URL: https://build.opensuse.org/request/show/494523
OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=17

patterns-base.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu May 11 07:18:16 UTC 2017 - sflees@suse.de
+- Proper fixes for the last change re generic_server, 
+  * console should require enhanced_base so its functionally the
+    same as x11
+  *  base should require minimal_base
+  * remove the following from base again as they are in minimal base
+    * openSUSE-build-key
+    * openSUSE-release
+    * rpm
+  * other minor tidyup's 
+
 -------------------------------------------------------------------
 Wed May 10 19:44:25 UTC 2017 - dleuenberger@suse.com
 

patterns-base.spec

@@ -42,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
@@ -61,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
@@ -81,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
@@ -111,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
 
@@ -134,20 +134,19 @@ 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:       pattern() = minimal_base
+
 Requires:       kbd
-Requires:       openSUSE-build-key
-Requires:       openSUSE-release
 Requires:       openssh
 Requires:       polkit
 Requires:       polkit-default-privs
-Requires:       procps
 Requires:       rpm
 Requires:       shadow
 Requires:       util-linux
@@ -196,12 +195,14 @@ 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-icon() = yast-system
 Provides:       pattern-order() = 1120
 Provides:       pattern-visible()
+Provides:       patterns-openSUSE-console = %{version}
 Obsoletes:      patterns-openSUSE-console < %{version}
+Requires:       pattern() = enhanced_base
+Recommends:     pattern() = yast2_basis
 
 Requires:       mc
 Requires:       openssh
@@ -255,49 +256,15 @@ Applications useful for those using the console and no graphical desktop environ
 
 ################################################################################
 
-%package generic_server
-%pattern_serverfunctions
-Summary:        Generic Server
-Group:          Metapackages
-Provides:       pattern() = generic_server
-Provides:       pattern-icon() = yast-ssh-server
-Provides:       pattern-order() = 1130
-Provides:       pattern-visible()
-Requires:       openssh
-Requires:       pattern() = basesystem
-Requires:       pattern() = minimal_base
-Recommends:     pattern() = yast2_basis
-Recommends:     ntp
-Recommends:     vim
-Recommends:     screen
-Recommends:     tmux
-Recommends:     mosh
-Recommends:     rsync
-Recommends:     sensors
-Recommends:     libyui-ncurses-pkg
-Recommends:     libyui-ncurses
-Recommends:     command-not-found
-Provides:       patterns-openSUSE-generic_server = %{version}
-Obsoletes:      patterns-openSUSE-generic_server < %{version}
-
-%description generic_server
-Software that is useful to run on a server.
-
-%files generic_server
-%dir /usr/share/doc/packages/patterns
-/usr/share/doc/packages/patterns/generic_server.txt
-
-################################################################################
-
 %package enhanced_base
 %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
@@ -339,13 +306,10 @@ Recommends:     db-utils
 Recommends:     diffutils
 Recommends:     ethtool
 Recommends:     e2fsprogs
-# provides eject
-Recommends:     util-linux
 Recommends:     file
 Recommends:     fillup
 Recommends:     findutils
 Recommends:     hwinfo
-Recommends:     kbd
 Recommends:     klogd
 # /bin/ip considered useful
 Recommends:     iproute2
@@ -364,15 +328,11 @@ Recommends:     openssh
 Recommends:     perl-base
 # we rely on cron for daily/hourly
 Recommends:     cronie
-# create log file tars
-Recommends:     procps
-Recommends:     shadow
 Recommends:     sysconfig
 Recommends:     systemd-sysvinit
 Recommends:     tar
 Recommends:     time
 Recommends:     wget
-Recommends:     which
 Recommends:     wol
 # split out of ncurses
 Recommends:     ncurses-utils
@@ -485,11 +445,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
@@ -591,11 +551,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
 
@@ -613,9 +573,12 @@ Requires:       pam
 Requires:       procps
 Requires:       rpm
 %if 0%{?is_opensuse}
+Requires:       openSUSE-build-key
 Requires:       openSUSE-release
 %else
 Requires:       sles-release
+Recommends:     suse-build-key
+Recommends:     SUSEConnect
 %endif
 Requires:       sysconfig
 Requires:       system-group-hardware
@@ -636,12 +599,6 @@ Recommends:     iproute2
 Recommends:     openssh
 Recommends:     rollback-helper
 Recommends:     snapper
-%if 0%{?is_opensuse}
-Requires:       openSUSE-build-key
-%else
-Recommends:     suse-build-key
-Recommends:     SUSEConnect
-%endif
 Recommends:     sysvinit-tools
 Recommends:     udev
 Suggests:       ed
@@ -663,10 +620,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
 
@@ -730,11 +687,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
@@ -753,11 +710,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
@@ -784,11 +741,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
@@ -866,11 +823,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
@@ -902,11 +859,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
@@ -925,7 +882,7 @@ This will install the 32-bit variant of all selected patterns. This allows to ex
 %install
 mkdir -p %{buildroot}/usr/share/doc/packages/patterns
 for i in 32bit 64bit apparmor apparmor_opt base console enhanced_base \
-    enhanced_base_opt generic_server minimal_base minimal_base-conflicts sw_management \
+    enhanced_base_opt minimal_base minimal_base-conflicts sw_management \
     update_test x11 x11_opt x86; do
 	echo "This file marks the pattern $i to be installed." \
 		>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"