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

- Version: 20190206
- Remove minimal_base_conflicts, its not in SLE or Leap anymore
  (boo#1103325)
- Change all the Recommends in minimal_base to Requires,
  minimal_base is always installed and can't be installed with
  --no-recommends (boo#1103326)
- Hardware specific packages should be in base pattern not
  minimal_base (boo#1106405)
- busybox should be in minimal_base to allow recovery from a big
  system failure
- Remove some duplicate entries between base and minimal_base
- Suggest rather then recommend man-pages (boo#1116987)
- Require xorg-x11-essentials rather then recommending xorg-x11
  (boo#1121730)
- Recommend web_browser and suggest Firefox to make it possible
  to install chromium instead
- Recommend rather then require multipath-tools, it is only in
  enhanced_base so requiring it doesn't make sense, if it Should
  be required it likely should be in base
- general cleanup, fix meta info spec-cleaner re arranged remove
  commented out packages

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

pattern-definition-32bit.txt

@@ -25,25 +25,33 @@ The 32bit pattern complementing apparmor.
 #
 %package base-32bit
 Summary:        Base System
-Recommends:     kbd-32bit
+Recommends:     e2fsprogs-32bit
+Recommends:     kmod-32bit
 Recommends:     openssh-32bit
 Recommends:     polkit-32bit
 Recommends:     polkit-default-privs-32bit
-Recommends:     rpm-32bit
 Recommends:     shadow-32bit
 Recommends:     util-linux-32bit
 Recommends:     which-32bit
 Recommends:     bash-completion-32bit
-Recommends:     busybox-static-32bit
+Recommends:     btrfsprogs-32bit
 Recommends:     ca-certificates-mozilla-32bit
 Recommends:     chrony-32bit
 Recommends:     cron-32bit
 Recommends:     cronie-32bit
 Recommends:     grub2-32bit
+Recommends:     glibc-locale-32bit
 Recommends:     systemd-sysvinit-32bit
+Recommends:     snapper-32bit
 Recommends:     branding-openSUSE-32bit
 Recommends:     branding-SLE-32bit
+Recommends:     efibootmgr-32bit
 Recommends:     shim-32bit
+Recommends:     grub2-x86_64-efi-32bit
+Recommends:     shim-32bit
+Recommends:     grub2-arm64-efi-32bit
+Recommends:     efibootmgr-32bit
+Recommends:     grub2-arm-efi-32bit
 Recommends:     lshw-32bit
 Recommends:     lsvpd-32bit
 Recommends:     ppc64-diag-32bit
@@ -67,7 +75,6 @@ Recommends:     pattern()-32bit
 Recommends:     pattern()-32bit
 Recommends:     pattern()-32bit
 Recommends:     pattern()-32bit
-Recommends:     firewalld-32bit
 Recommends:     aaa_base-extras-32bit
 Recommends:     acl-32bit
 Recommends:     alsa-plugins-32bit
@@ -79,8 +86,8 @@ Recommends:     bzip2-32bit
 Recommends:     cifs-utils-32bit
 Recommends:     command-not-found-32bit
 Recommends:     cpio-32bit
-Recommends:     cronie-32bit
 Recommends:     cpupower-32bit
+Recommends:     cronie-32bit
 Recommends:     cryptsetup-32bit
 Recommends:     cups-32bit
 Recommends:     cups-client-32bit
@@ -94,12 +101,13 @@ Recommends:     deltarpm-32bit
 Recommends:     diffutils-32bit
 Recommends:     dos2unix-32bit
 Recommends:     e2fsprogs-32bit
+Recommends:     ethtool-32bit
 Recommends:     file-32bit
 Recommends:     fillup-32bit
 Recommends:     findutils-32bit
+Recommends:     firewalld-32bit
 Recommends:     fuse-32bit
 Recommends:     gawk-32bit
-Recommends:     genisoimage-32bit
 Recommends:     gettext-runtime-32bit
 Recommends:     glibc-locale-32bit
 Recommends:     gpart-32bit
@@ -119,40 +127,42 @@ Recommends:     kmod-compat-32bit
 Recommends:     kpartx-32bit
 Recommends:     krb5-32bit
 Recommends:     less-32bit
-Recommends:     lsscsi-32bit
 Recommends:     logrotate-32bit
+Recommends:     lsscsi-32bit
 Recommends:     mailx-32bit
 Recommends:     man-32bit
 Recommends:     mdadm-32bit
 Recommends:     multipath-tools-32bit
 Recommends:     ncurses-utils-32bit
-Recommends:     net-tools-32bit
+Recommends:     net-snmp-32bit
 Recommends:     netcat-openbsd-32bit
 Recommends:     netcfg-32bit
-Recommends:     net-snmp-32bit
 Recommends:     nfs-client-32bit
 Recommends:     nfsidmap-32bit
 Recommends:     nscd-32bit
+Recommends:     ntfs-3g-32bit
+Recommends:     ntfsprogs-32bit
 Recommends:     openslp-32bit
 Recommends:     openssh-32bit
 Recommends:     pam-config-32bit
 Recommends:     parted-32bit
 Recommends:     pciutils-32bit
 Recommends:     pciutils-ids-32bit
-Recommends:     pcre-32bit
 Recommends:     perl-Bootloader-32bit
 Recommends:     perl-base-32bit
 Recommends:     pinentry-32bit
-Recommends:     popt-32bit
 Recommends:     postfix-32bit
-Recommends:     rsyslog-32bit
+Recommends:     psmisc-32bit
 Recommends:     rsync-32bit
+Recommends:     rsyslog-32bit
 Recommends:     scout-32bit
 Recommends:     screen-32bit
 Recommends:     sed-32bit
 Recommends:     sg3_utils-32bit
 Recommends:     smartmontools-32bit
+Recommends:     sudo-32bit
 Recommends:     sysconfig-32bit
+Recommends:     system-tuning-common-SUSE-32bit
 Recommends:     systemd-sysvinit-32bit
 Recommends:     time-32bit
 Recommends:     timezone-32bit
@@ -174,30 +184,8 @@ Recommends:     grub2-branding-openSUSE-32bit
 Recommends:     plymouth-32bit
 Recommends:     plymouth-branding-openSUSE-32bit
 Recommends:     release-notes-openSUSE-32bit
-Recommends:     plymouth-32bit
 Recommends:     grub2-branding-SLE-32bit
-Recommends:     OpenIPMI-32bit
+Recommends:     plymouth-32bit
-Recommends:     bash-completion-32bit
-Recommends:     cpp-32bit
-Recommends:     cryptconfig-32bit
-Recommends:     expect-32bit
-Recommends:     ipmitool-32bit
-Recommends:     lvm2-32bit
-Recommends:     m4-32bit
-Recommends:     make-32bit
-Recommends:     mksh-32bit
-Recommends:     mutt-32bit
-Recommends:     quota-32bit
-Recommends:     supportutils-32bit
-Recommends:     sysfsutils-32bit
-Recommends:     tcsh-32bit
-Recommends:     w3m-32bit
-Recommends:     lsof-32bit
-Recommends:     psmisc-32bit
-Recommends:     sudo-32bit
-Recommends:     ethtool-32bit
-Recommends:     ntfs-3g-32bit
-Recommends:     ntfsprogs-32bit
 Recommends:     dmraid-32bit
 Recommends:     dosfstools-32bit
 Recommends:     ifplugd-32bit
@@ -205,7 +193,7 @@ Recommends:     klogd-32bit
 Recommends:     nano-32bit
 Recommends:     openldap2-client-32bit
 Recommends:     prctl-32bit
-Recommends:     recode-32bit
+Recommends:     psmisc-32bit
 Recommends:     smp_utils-32bit
 Recommends:     strace-32bit
 Recommends:     syslinux-32bit
@@ -234,47 +222,38 @@ The 32bit pattern complementing enhanced_base.
 #
 %package minimal_base-32bit
 Summary:        Base System
-Recommends:     pattern()-32bit
 Recommends:     aaa_base-32bit
 Recommends:     bash-32bit
+Recommends:     busybox-static-32bit
 Recommends:     coreutils-32bit
 Recommends:     device-mapper-32bit
 Recommends:     distribution-release-32bit
 Recommends:     dracut-32bit
-Recommends:     e2fsprogs-32bit
+Recommends:     elfutils-32bit
 Recommends:     filesystem-32bit
 Recommends:     glibc-32bit
+Recommends:     iproute2-32bit
 Recommends:     kbd-32bit
-Recommends:     kmod-32bit
+Recommends:     openssh-32bit
 Recommends:     pam-32bit
 Recommends:     procps-32bit
 Recommends:     rpm-32bit
 Recommends:     sysconfig-32bit
 Recommends:     system-group-hardware-32bit
-Recommends:     system-user-nobody-32bit
-Recommends:     systemd-32bit
-Recommends:     zypper-32bit
-Recommends:     btrfsmaintenance-32bit
-Recommends:     btrfsprogs-32bit
-Recommends:     elfutils-32bit
-Recommends:     glibc-locale-32bit
-Recommends:     grub2-32bit
-Recommends:     iproute2-32bit
-Recommends:     openssh-32bit
-Recommends:     snapper-32bit
-Recommends:     system-group-trusted-32bit
 Recommends:     system-group-wheel-32bit
+Recommends:     system-user-nobody-32bit
 Recommends:     system-user-bin-32bit
 Recommends:     system-user-daemon-32bit
-Recommends:     systemd-coredump-32bit
+Recommends:     systemd-32bit
 Recommends:     sysvinit-tools-32bit
 Recommends:     udev-32bit
+Recommends:     zypper-32bit
+Recommends:     systemd-coredump-32bit
 Recommends:     rollback-helper-32bit
 Recommends:     openSUSE-build-key-32bit
-Recommends:     rollback_helper-32bit
 Recommends:     SUSEConnect-32bit
+Recommends:     rollback_helper-32bit
 Recommends:     suse-build-key-32bit
-Recommends:     efibootmgr-32bit
 Provides:       pattern() = minimal_base%2d32bit
 Group:          Metapackages
 Supplements:    packageand(patterns-base-32bit:patterns-base-minimal_base)
@@ -315,31 +294,30 @@ Recommends:     pattern()-32bit
 Recommends:     pattern()-32bit
 Recommends:     xorg-x11-fonts-core-32bit
 Recommends:     xorg-x11-server-32bit
-Recommends:     xf86-input-libinput-32bit
-Recommends:     xf86-input-vmmouse-32bit
-Recommends:     xf86-input-wacom-32bit
-Recommends:     xorg-x11-32bit
-Recommends:     x11-tools-32bit
-Recommends:     xorg-x11-driver-video-32bit
-Recommends:     xorg-x11-essentials-32bit
-Recommends:     xorg-x11-server-extra-32bit
-Recommends:     xorg-x11-fonts-32bit
 Recommends:     yast2-qt-32bit
 Recommends:     dejavu-fonts-32bit
 Recommends:     google-roboto-fonts-32bit
-Recommends:     icewm-theme-branding-32bit
 Recommends:     icewm-default-32bit
-Recommends:     lightdm-32bit
+Recommends:     icewm-theme-branding-32bit
-Recommends:     openssh-askpass-gnome-32bit
-Recommends:     noto-sans-fonts-32bit
-Recommends:     tigervnc-32bit
-Recommends:     xdmbgrd-32bit
-Recommends:     xorg-x11-Xvnc-32bit
-Recommends:     xtermset-32bit
-Recommends:     xterm-32bit
 Recommends:     libyui-qt-32bit
 Recommends:     libyui-qt-pkg-32bit
+Recommends:     lightdm-32bit
+Recommends:     noto-sans-fonts-32bit
+Recommends:     openssh-askpass-gnome-32bit
+Recommends:     tigervnc-32bit
+Recommends:     x11-tools-32bit
+Recommends:     xdmbgrd-32bit
+Recommends:     xorg-x11-Xvnc-32bit
+Recommends:     xorg-x11-driver-video-32bit
+Recommends:     xorg-x11-essentials-32bit
+Recommends:     xorg-x11-fonts-32bit
+Recommends:     xorg-x11-server-extra-32bit
+Recommends:     xterm-32bit
+Recommends:     xtermset-32bit
 Recommends:     yast2-control-center-32bit
+Recommends:     xf86-input-libinput-32bit
+Recommends:     xf86-input-vmmouse-32bit
+Recommends:     xf86-input-wacom-32bit
 Provides:       pattern() = x11%2d32bit
 Group:          Metapackages
 Supplements:    packageand(patterns-base-32bit:patterns-base-x11)
@@ -360,18 +338,21 @@ Recommends:     pattern()-32bit
 Recommends:     pattern()-32bit
 Recommends:     glibc-locale-32bit
 Recommends:     xkeyboard-config-32bit
-Recommends:     MozillaFirefox-32bit
+Recommends:     xorg-x11-essentials-32bit
-Recommends:     MozillaFirefox-translations-32bit
+Recommends:     web-browser-32bit
 Recommends:     cabextract-32bit
 Recommends:     command-not-found-32bit
-Recommends:     dialog-32bit
 Recommends:     dbus-1-glib-32bit
 Recommends:     dbus-1-x11-32bit
+Recommends:     dialog-32bit
 Recommends:     fontconfig-32bit
 Recommends:     fonts-config-32bit
 Recommends:     fribidi-32bit
 Recommends:     ghostscript-x11-32bit
+Recommends:     icewm-default-32bit
+Recommends:     lightdm-32bit
 Recommends:     numlockx-32bit
+Recommends:     tigervnc-32bit
 Recommends:     translation-update-32bit
 Recommends:     xauth-32bit
 Recommends:     xdmbgrd-32bit

patterns-base.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Feb  5 23:24:03 UTC 2019 - Simon Lees <sflees@suse.de>
+
+- Version: 20190206
+- Remove minimal_base_conflicts, its not in SLE or Leap anymore
+  (boo#1103325)
+- Change all the Recommends in minimal_base to Requires,
+  minimal_base is always installed and can't be installed with
+  --no-recommends (boo#1103326)
+- Hardware specific packages should be in base pattern not
+  minimal_base (boo#1106405)
+- busybox should be in minimal_base to allow recovery from a big
+  system failure
+- Remove some duplicate entries between base and minimal_base
+- Suggest rather then recommend man-pages (boo#1116987)
+- Require xorg-x11-essentials rather then recommending xorg-x11
+  (boo#1121730)
+- Recommend Web-web_browser and suggest Firefox to make it possible
+  to install chromium instead
+- Recommend rather then require multipath-tools, it is only in
+  enhanced_base so requiring it doesn't make sense, if it Should
+  be required it likely should be in base
+- general cleanup, fix meta info spec-cleaner re arranged remove
+  commented out packages
+
 -------------------------------------------------------------------
 Thu Jan 10 17:36:23 UTC 2019 - Dirk Mueller <dmueller@suse.com>
 

patterns-base.spec

@@ -18,7 +18,7 @@
 
 %bcond_with betatest
 Name:           patterns-base
-Version:        20190110
+Version:        20190206
 Release:        0
 Summary:        Patterns for Installation (base patterns)
 License:        MIT
@@ -79,17 +79,6 @@ Provides:       pattern-icon() = pattern-apparmor
 Provides:       pattern-order() = 1100
 Provides:       pattern-visible()
 %if 0%{?is_opensuse}
-Recommends:     pattern() = apparmor_opt
-%endif
-Requires:       pattern() = minimal_base
-Requires:       apparmor-abstractions
-Requires:       apparmor-parser
-Requires:       apparmor-profiles
-Recommends:     apparmor-docs
-Recommends:     apparmor-utils
-Recommends:     yast2-apparmor
-Suggests:       pam_apparmor
-%if 0%{?is_opensuse}
 Provides:       patterns-openSUSE-apparmor = %{version}
 Obsoletes:      patterns-openSUSE-apparmor < %{version}
 %else
@@ -98,6 +87,18 @@ Provides:       patterns-sles-apparmor = %{version}
 Obsoletes:      patterns-sled-apparmor < %{version}
 Obsoletes:      patterns-sles-apparmor < %{version}
 %endif
+Requires:       pattern() = minimal_base
+%if 0%{?is_opensuse}
+Recommends:     pattern() = apparmor_opt
+%endif
+
+Requires:       apparmor-abstractions
+Requires:       apparmor-parser
+Requires:       apparmor-profiles
+Recommends:     apparmor-docs
+Recommends:     apparmor-utils
+Recommends:     yast2-apparmor
+Suggests:       pam_apparmor
 %if 0%{?is_opensuse}
 Requires:       audit
 %else
@@ -125,6 +126,7 @@ Provides:       pattern-order() = 1080
 Provides:       patterns-openSUSE-apparmor_opt = %{version}
 Obsoletes:      patterns-openSUSE-apparmor_opt < %{version}
 Requires:       pattern() = minimal_base
+
 Requires:       apparmor-docs
 
 %description apparmor_opt
@@ -162,25 +164,6 @@ Provides:       pattern() = base
 Provides:       pattern-icon() = pattern-basis
 Provides:       pattern-order() = 1030
 Provides:       pattern-visible()
-Requires:       pattern() = minimal_base
-Requires:       kbd
-Requires:       openssh
-Requires:       polkit
-Requires:       polkit-default-privs
-Requires:       rpm
-Requires:       shadow
-Requires:       util-linux
-Requires:       which
-Recommends:     bash-completion
-# Add some static base tool in case system explodes
-Recommends:     busybox-static
-Recommends:     ca-certificates-mozilla
-Recommends:     chrony
-Recommends:     cron
-# we rely on cron for daily/hourly
-Recommends:     cronie
-Recommends:     grub2
-Recommends:     systemd-sysvinit
 %if 0%{?is_opensuse}
 Provides:       patterns-openSUSE-base = %{version}
 Obsoletes:      patterns-openSUSE-base < %{version}
@@ -190,6 +173,28 @@ Provides:       patterns-sles-minimal
 Obsoletes:      patterns-sles-base < %{version}
 Obsoletes:      patterns-sles-minimal < %{version}
 %endif
+Requires:       pattern() = minimal_base
+
+Requires:       e2fsprogs
+Requires:       kmod
+Requires:       openssh
+Requires:       polkit
+Requires:       polkit-default-privs
+Requires:       shadow
+Requires:       util-linux
+Requires:       which
+Recommends:     bash-completion
+Recommends:     btrfsprogs
+Recommends:     ca-certificates-mozilla
+Recommends:     chrony
+Recommends:     cron
+# we rely on cron for daily/hourly
+Recommends:     cronie
+Recommends:     grub2
+Recommends:     glibc-locale
+Recommends:     systemd-sysvinit
+Recommends:     snapper
+
 %if 0%{?is_opensuse}
 # get it branded
 Recommends:     branding-openSUSE
@@ -197,6 +202,7 @@ Recommends:     branding-openSUSE
 Recommends:     branding-SLE
 %endif
 %ifarch x86_64
+Recommends:     efibootmgr
 Recommends:     shim
 Recommends:     grub2-x86_64-efi
 %endif
@@ -205,6 +211,7 @@ Recommends:     shim
 Recommends:     grub2-arm64-efi
 %endif
 %ifarch %arm
+Recommends:     efibootmgr
 Recommends:     grub2-arm-efi
 %endif
 %ifarch ppc ppc64 ppc64le
@@ -239,6 +246,7 @@ Provides:       patterns-openSUSE-console = %{version}
 Obsoletes:      patterns-openSUSE-console < %{version}
 Requires:       pattern() = enhanced_base
 Recommends:     pattern() = yast2_basis
+
 Recommends:     at
 Recommends:     bc
 Recommends:     ed
@@ -294,6 +302,11 @@ Provides:       pattern-icon() = pattern-documentation
 Provides:       pattern-order() = 1005
 Provides:       pattern-visible()
 Requires:       pattern() = basesystem
+%if !0%{?is_opensuse}
+Provides:       patterns-sled-documentation
+Obsoletes:      patterns-sles-documentation < %{version}
+%endif
+
 Recommends:     info2html
 Recommends:     man-pages
 # note pam is in every install so no point in using packageand
@@ -301,10 +314,6 @@ Recommends:     pam-doc
 Recommends:     susehelp
 Recommends:     susehelp_en
 %if !0%{?is_opensuse}
-Provides:       patterns-sled-documentation
-Obsoletes:      patterns-sles-documentation < %{version}
-%endif
-%if !0%{?is_opensuse}
 Recommends:     sled-admin_en-pdf
 Recommends:     sled-gnomeuser_en-pdf
 Recommends:     sled-manuals_en-pdf
@@ -330,15 +339,17 @@ Provides:       pattern-icon() = pattern-basis
 Provides:       pattern-order() = 1060
 Provides:       pattern-visible()
 %if 0%{?is_opensuse}
-Recommends:     pattern() = enhanced_base_opt
+Provides:       patterns-openSUSE-enhanced_base = %{version}
+Obsoletes:      patterns-openSUSE-enhanced_base < %{version}
 %endif
 Requires:       pattern() = base
-# TODO: If this is a requires here it should probably only be somewhere else
-# or just a recommends
-Requires:       multipath-tools
 Recommends:     pattern() = apparmor
 Recommends:     pattern() = sw_management
 Recommends:     pattern() = yast2_basis
+%if 0%{?is_opensuse}
+Recommends:     pattern() = enhanced_base_opt
+%endif
+
 Recommends:     aaa_base-extras
 # getfacl and setfacl
 Recommends:     acl
@@ -413,6 +424,7 @@ Recommends:     mailx
 Recommends:     man
 # needed for detecting software raid - required by yast2-storage too
 Recommends:     mdadm
+Recommends:     multipath-tools
 # split out of ncurses
 Recommends:     ncurses-utils
 Recommends:     net-snmp
@@ -473,10 +485,6 @@ Suggests:       cpupower
 Suggests:       pam_ssh
 Suggests:       xfsprogs
 Suggests:       zip
-%if 0%{?is_opensuse}
-Provides:       patterns-openSUSE-enhanced_base = %{version}
-Obsoletes:      patterns-openSUSE-enhanced_base < %{version}
-%endif
 %ifarch aarch64 %ix86 x86_64
 Recommends:     dmidecode
 %endif
@@ -560,8 +568,8 @@ Provides:       pattern-icon() = pattern-software-management
 Provides:       pattern-order() = 1040
 Provides:       patterns-openSUSE-enhanced_base_opt = %{version}
 Obsoletes:      patterns-openSUSE-enhanced_base_opt < %{version}
+
 Recommends:     joe
-Recommends:     man-pages
 Recommends:     mpt-status
 Recommends:     perl-TermReadLine-Gnu
 Recommends:     prctl
@@ -586,6 +594,7 @@ Suggests:       groff
 Suggests:       hfsutils
 # bnc#388570
 Suggests:       kerneloops
+Suggests:       man-pages
 Suggests:       man-pages-posix
 Suggests:       ocfs2-tools
 Suggests:       pwgen
@@ -620,59 +629,52 @@ Provides:       pattern-order() = 5190
 Provides:       pattern-visible()
 Provides:       patterns-openSUSE-minimal_base = %{version}
 Obsoletes:      patterns-openSUSE-minimal_base < %{version}
-# TODO: Can we kill minimal_base_conflicts boo#1103325
+
-%if 0%{?is_opensuse}
-Recommends:     pattern() = minimal_base_conflicts
-%endif
 Requires:       aaa_base
 Requires:       bash
+# Add some static base tool in case system explodes
+Requires:       busybox-static
 Requires:       coreutils
 Requires:       device-mapper
 Requires:       distribution-release
 Requires:       dracut
-Requires:       e2fsprogs
+Requires:       elfutils
 Requires:       filesystem
 Requires:       glibc
+Requires:       iproute2
 Requires:       kbd
-Requires:       kmod
+Requires:       openssh
 Requires:       pam
 Requires:       procps
 Requires:       rpm
 Requires:       sysconfig
 Requires:       system-group-hardware
+Requires:       system-group-wheel
 Requires:       system-user-nobody
+Requires:       system-user-bin
+Requires:       system-user-daemon
 Requires:       systemd
+Requires:       sysvinit-tools
+Requires:       udev
 Requires:       zypper
-Recommends:     btrfsprogs
+# Note it makes no sense to recommend packages in minimal_base as it can't
-Recommends:     elfutils
+# be installed with --no-recommends if your package can be Recommended rather
-Recommends:     glibc-locale
+# then required it likely belongs in base and not here.
-Recommends:     grub2
-Recommends:     iproute2
-Recommends:     openssh
-Recommends:     snapper
-Recommends:     system-group-wheel
-Recommends:     system-user-bin
-Recommends:     system-user-daemon
-Recommends:     sysvinit-tools
-Recommends:     udev
-Suggests:       ed
 %if ! 0%{?is_opensuse}
-Recommends:     systemd-coredump
+Requires:       systemd-coredump
 %endif
 # rollback-helper is useful on Leap / SLE but not tumbleweed
 %if 0%{?sle_version}
-Recommends:     rollback-helper
+Requires:       rollback-helper
 %endif
 %if 0%{?is_opensuse}
 Requires:       openSUSE-build-key
 %else
-Recommends:     SUSEConnect
+Requires:       SUSEConnect
-Recommends:     rollback_helper
+Requires:       rollback_helper
-Recommends:     suse-build-key
+Requires:       suse-build-key
-%endif
-%ifarch x86_64 %arm
-Recommends:     efibootmgr
 %endif
+
 %if 0%{?is_opensuse}
 %description minimal_base
 This is the minimal openSUSE runtime system. It is really a minimal system, you can login and a shell will be started, that's all. It is intended as base for Appliances.
@@ -687,75 +689,6 @@ This is the minimal SLE runtime system. It is really a minimal system, you can l
 
 ################################################################################
 
-# TODO: Kill minimal_base_conflicts - Not in Leap 15
-%if 0%{?is_opensuse}
-%package minimal_base_conflicts
-%pattern_basetechnologies
-Summary:        Base System
-Group:          Metapackages
-Provides:       pattern() = minimal_base_conflicts
-Provides:       pattern-icon() = pattern-basis
-Provides:       pattern-order() = 5191
-Provides:       patterns-openSUSE-minimal_base-conflicts = %{version}
-Obsoletes:      patterns-openSUSE-minimal_base-conflicts < %{version}
-Requires:       pattern() = minimal_base
-Conflicts:      bash-doc
-Conflicts:      bundle-lang-gnome-extras-en
-Conflicts:      cups-client
-# required by gio-branding
-Conflicts:      desktop-data-openSUSE
-Conflicts:      desktop-translations
-Conflicts:      glib-networking
-# supplements into glib
-Conflicts:      gsettings-backend-dconf
-# perl ~ 40MB ## - we can't conflict with that as perl-Bootloader-YAML needs it
-#Conflicts:      perl
-# binutils ~ 30MB
-#Conflicts:      binutils
-# pulls perl
-#Conflicts:      zypper-aptitude
-# pulls perl
-#Conflicts:      perl-gettext
-# gtk3
-Conflicts:      gtk3-branding
-Conflicts:      gtk3-immodule-amharic
-Conflicts:      gtk3-immodule-inuktitut
-Conflicts:      gtk3-immodule-thai
-Conflicts:      gtk3-immodule-tigrigna
-Conflicts:      gtk3-immodule-vietnamese
-Conflicts:      gvfs
-# supplements libgio and wget (TODO)
-Conflicts:      libproxy1-config-gnome3
-Conflicts:      netpbm
-# requires X11
-Conflicts:      openssh-askpass
-Conflicts:      perl-doc
-# systemd recommends dbus-1-python
-Conflicts:      python
-# python-base ~ 20MB
-Conflicts:      python-base
-Conflicts:      readline-doc
-# recommended by yast2-printer
-Conflicts:      samba-client
-Conflicts:      smtp_daemon
-Conflicts:      vim-data
-# requires all kinds of perl modules
-Conflicts:      xdg-utils
-# supplements yast2, not needed for ncurses only
-Conflicts:      yast2-branding
-# requires python
-Conflicts:      zypper-log
-
-%description minimal_base_conflicts
-This is the base runtime system.  It contains only a minimal multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own.
-
-%files minimal_base_conflicts
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/minimal_base_conflicts.txt
-%endif
-
-################################################################################
-
 %package transactional_base
 %pattern_basetechnologies
 Summary:        Transactional Base System
@@ -763,7 +696,9 @@ Group:          Metapackages
 Provides:       pattern() = transactional_base
 Provides:       pattern-icon() = pattern-kubic
 Provides:       pattern-order() = 1050
+Obsoletes:      pattern() = readonly_root_tools
 Requires:       pattern() = base
+
 Requires:       read-only-root-fs
 Requires:       rebootmgr
 Requires:       systemd-presets-branding-transactional-server
@@ -771,7 +706,6 @@ Requires:       transactional-update
 Requires:       transactional-update-zypp-config
 Recommends:     pattern() = enhanced_base
 Suggests:       health-checker
-Obsoletes:      pattern() = readonly_root_tools
 
 %description transactional_base
 This is the base system for a host updated by Transactional Updates. Includes Tools for systems with a read-only root filesystem.
@@ -790,14 +724,15 @@ Provides:       pattern() = sw_management
 Provides:       pattern-icon() = pattern-software-management
 Provides:       pattern-order() = 1360
 Provides:       pattern-visible()
-# Zypper is the basic sw_management stack for *SUSE
-Requires:       zypper
-Recommends:     pattern() = sw_management_x11
 %if 0%{?is_opensuse}
 Provides:       patterns-openSUSE-sw_management = %{version}
 Obsoletes:      patterns-openSUSE-sw_management < %{version}
 %endif
 %if 0%{?sle_version}
+Recommends:     pattern() = sw_management_x11
+
+# Zypper is the basic sw_management stack for *SUSE
+Requires:       zypper
 Recommends:     lifecycle-data
 Recommends:     zypper-lifecycle-plugin
 %endif
@@ -822,6 +757,7 @@ Provides:       pattern-order() = 1380
 Provides:       pattern-visible()
 Provides:       patterns-openSUSE-update_test = %{version}
 Obsoletes:      patterns-openSUSE-update_test < %{version}
+
 Recommends:     update-test-affects-package-manager
 Recommends:     update-test-interactive
 Recommends:     update-test-optional
@@ -852,15 +788,17 @@ Provides:       pattern-icon() = pattern-x11
 Provides:       pattern-order() = 1800
 Provides:       pattern-visible()
 %if 0%{?is_opensuse}
+Provides:       patterns-openSUSE-x11 = %{version}
+Obsoletes:      patterns-openSUSE-x11 < %{version}
+%endif
+Requires:       pattern() = base
+%if 0%{?is_opensuse}
 Recommends:     pattern() = x11_enhanced
 Recommends:     pattern() = x11_opt
 %endif
-Requires:       pattern() = base
+
 Requires:       xorg-x11-fonts-core
 Requires:       xorg-x11-server
-# required by xdm
-# Requires:       xterm
-# FIXME really requires ?
 Requires:       yast2-qt
 Recommends:     dejavu-fonts
 Recommends:     google-roboto-fonts
@@ -877,10 +815,7 @@ Recommends:     noto-sans-fonts
 Recommends:     openssh-askpass-gnome
 Recommends:     tigervnc
 Recommends:     x11-tools
-# really ??
-# Recommends:     unclutter
 Recommends:     xdmbgrd
-Recommends:     xorg-x11
 Recommends:     xorg-x11-Xvnc
 Recommends:     xorg-x11-driver-video
 Recommends:     xorg-x11-essentials
@@ -889,10 +824,7 @@ Recommends:     xorg-x11-server-extra
 Recommends:     xterm
 Recommends:     xtermset
 Recommends:     yast2-control-center
-%if 0%{?is_opensuse}
+
-Provides:       patterns-openSUSE-x11 = %{version}
-Obsoletes:      patterns-openSUSE-x11 < %{version}
-%endif
 # bsc#1071953
 %ifnarch s390 s390x
 Requires:       xf86-input-libinput
@@ -917,17 +849,25 @@ Provides:       pattern() = x11_enhanced
 Provides:       pattern-icon() = pattern-x11
 Provides:       pattern-order() = 1801
 %if 0%{?is_opensuse}
-Recommends:     pattern() = x11_opt
+Obsoletes:      patterns-openSUSE-x11 < %{version}
+%else
+Provides:       patterns-sled-minimal
+Obsoletes:      patterns-sled-minimal < %{version}
 %endif
 Requires:       pattern() = enhanced_base
 Requires:       pattern() = fonts
 Requires:       pattern() = x11
+Recommends:     pattern() = x11_yast
+%if 0%{?is_opensuse}
+Recommends:     pattern() = x11_opt
+%endif
+
 # 1057377
 Requires:       glibc-locale
 Requires:       xkeyboard-config
-Recommends:     pattern() = x11_yast
+Requires:       xorg-x11-essentials
-Recommends:     MozillaFirefox
+# make it possible to install firefox or chromium
-Recommends:     MozillaFirefox-translations
+Recommends:     web_browser
 Recommends:     cabextract
 Recommends:     command-not-found
 Recommends:     dbus-1-glib
@@ -954,13 +894,10 @@ Recommends:     xorg-x11-fonts
 Recommends:     xorg-x11-fonts-core
 Recommends:     yast2-control-center-gnome
 Recommends:     yast2-scanner
-#Provides:       pattern-visible()
+# This will install Firefox if no other browser is selected
-%if 0%{?is_opensuse}
+Suggests:       MozillaFirefox
-Obsoletes:      patterns-openSUSE-x11 < %{version}
+Suggests:       MozillaFirefox-translations
-%else
+
-Provides:       patterns-sled-minimal
-Obsoletes:      patterns-sled-minimal < %{version}
-%endif
 %if 0%{?is_opensuse}
 # #394406
 Suggests:       desktop-data-openSUSE-extra
@@ -1046,7 +983,7 @@ done
 
 # These packages don't generate a 32bit pattern
 %if 0%{?is_opensuse}
-for i in apparmor_opt basesystem console documentation minimal_base_conflicts enhanced_base_opt transactional_base update_test x11_opt; do
+for i in apparmor_opt basesystem console documentation enhanced_base_opt transactional_base update_test x11_opt; do
 %else
 for i in \
 %ifnarch s390 s390x