From f980f2fa0b1129bce83b656a495893d09d8abeee1c2decefdd715105ed27179f Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 10 May 2017 19:46:01 +0000
Subject: [PATCH] Re-introduce generic_server pattern

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patterns-base?expand=0&rev=4
---
 patterns-base.changes |  9 +++++++++
 patterns-base.spec    | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/patterns-base.changes b/patterns-base.changes
index ae4dce0..c975151 100644
--- a/patterns-base.changes
+++ b/patterns-base.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May 10 19:44:25 UTC 2017 - dleuenberger@suse.com
+
+- Re-introduce generic_server pattern: it requires minimal_base and
+  basesystem (including zypper) and recommends yast2_basis. The
+  use of the 'pure' console pattern did not work out as expected:
+  none of the management tools are part of the generic console
+  toolset (which is correct).
+
 -------------------------------------------------------------------
 Wed May  3 12:55:04 CEST 2017 - kukuk@suse.de
 
diff --git a/patterns-base.spec b/patterns-base.spec
index 63e3a69..e0ed11e 100644
--- a/patterns-base.spec
+++ b/patterns-base.spec
@@ -255,6 +255,40 @@ 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
@@ -891,7 +925,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 minimal_base minimal_base-conflicts sw_management \
+    enhanced_base_opt generic_server 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"