Accepting request 1296328 from system:install:head

- No longer require issue-generator on transactional systems. agetty produces the needed output by itself. OBS-URL: https://build.opensuse.org/request/show/1296328 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patterns-base?expand=0&rev=134
- No longer require issue-generator on transactional systems.
2025-08-01 20:40:07 +00:00 · 2025-07-29 13:12:05 +00:00 · 2025-07-26 11:40:47 +00:00 · 2025-07-25 14:59:02 +00:00 · 2025-07-18 13:57:51 +00:00 · 2025-07-17 15:17:28 +00:00
3 changed files with 484 additions and 82 deletions
--- a/pattern-definition-32bit.txt
+++ b/pattern-definition-32bit.txt
@@ -1,3 +1,4 @@
 %if 0%{?is_opensuse}
 %package apparmor-32bit
 Summary:        AppArmor
 Recommends:     apparmor-abstractions-32bit
@@ -19,6 +20,7 @@ Supplements:    packageand(patterns-base-32bit:patterns-base-apparmor)
 %description apparmor-32bit
 The 32bit pattern complementing apparmor.
 %endif
 #
 #-------------------------------------------------------------------
 #
@@ -81,7 +83,6 @@ Recommends:     openssh-32bit
 Recommends:     aaa_base-extras-32bit
 Recommends:     acl-32bit
 Recommends:     attr-32bit
 Recommends:     autofs-32bit
 Recommends:     bash-completion-32bit
 Recommends:     bind-utils-32bit
 Recommends:     bzip2-32bit
@@ -129,8 +130,6 @@ Recommends:     ncurses-utils-32bit
 Recommends:     net-snmp-32bit
 Recommends:     netcat-openbsd-32bit
 Recommends:     netcfg-32bit
 Recommends:     nfs-client-32bit
 Recommends:     nfsidmap-32bit
 Recommends:     nscd-32bit
 Recommends:     ntfs-3g-32bit
 Recommends:     ntfsprogs-32bit
--- a/patterns-base.changes
+++ b/patterns-base.changes
@@ -1,3 +1,230 @@
 -------------------------------------------------------------------
 Tue Jul 29 13:11:04 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
 - No longer require issue-generator on transactional systems.
  agetty produces the needed output by itself.
 -------------------------------------------------------------------
 Wed Jul 23 08:53:48 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 - Drop xsetmode and xsetpointer from x11_raspberrypi (boo#1246921)
 -------------------------------------------------------------------
 Thu Jul 17 09:14:25 UTC 2025 - Petr Mladek <pmladek@suse.com>
 - Add kernel_livepatching pattern for SLES16 (bsc#1246606).
 -------------------------------------------------------------------
 Wed Jul 16 06:09:01 UTC 2025 - Max Lin <mlin@suse.com>
 - Do not build transactional_base pattern for Leap 16
 -------------------------------------------------------------------
 Wed Jul 16 06:01:34 UTC 2025 - Max Lin <mlin@suse.com>
 - Drop yast inclusion for Leap 16, code-o-o#leap/features/173
 -------------------------------------------------------------------
 Thu Jul 10 11:04:51 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Add suse-lifecyle* packages to sw_management pattern
  (bsc#1240517).
 -------------------------------------------------------------------
 Wed Jul  2 15:04:17 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Add a kdump pattern (bsc#1244712).
 -------------------------------------------------------------------
 Sat Jun 28 08:47:11 UTC 2025 - Lubos Kocman <lubos.kocman@suse.com>
 - Add myrlyn to x11_enhanced 
  Myrlyn replaces YaST software management code-o-o#leap/features#173
 -------------------------------------------------------------------
 Thu Jun 26 15:25:00 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Refine topics and descriptions of patterns (bsc#1243961).
 -------------------------------------------------------------------
 Thu Jun 26 14:39:55 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Drop requirement on NetworkManager-wifi, it was merged back in
  NetworkManager in 2022.
 -------------------------------------------------------------------
 Thu Jun 12 14:39:31 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 - Remove xf86-video-fbdev from x11_raspberrypi pattern as the
  package has been removed - boo#1243696
 -------------------------------------------------------------------
 Tue Jun 10 14:31:01 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Add cockpit-packages to sw_management Recommends for SLES 16.0
 (bsc#1240517).
 -------------------------------------------------------------------
 Thu Apr 17 10:13:32 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
 - Do not force-require chrony, but rather ntp-daemon and Suggest
  chrony as the default we want (boo#1233542).
 -------------------------------------------------------------------
 Thu Apr  3 08:37:18 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Replace sle_version is !is_opensuse macro (bsc#1240642).
 -------------------------------------------------------------------
 Sat Mar 22 09:10:11 UTC 2025 - Dr. Werner Fink <werner@suse.de>
 - On S390x plymouth is rather useless therefore replace it with
  blog-plymouth for similar services but without boot splash 
 -------------------------------------------------------------------
 Thu Mar 20 13:46:31 UTC 2025 - Olaf Kirch <okir@suse.com>
 - Add lvm2 to enhanced_base (#1239784)
 -------------------------------------------------------------------
 Wed Mar 12 14:18:51 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
 - Remove setserial, stty is the tool for this since a long time
 -------------------------------------------------------------------
 Mon Mar 10 09:27:33 UTC 2025 - Giacomo Leidi <giacomo.leidi@suse.com>
 - Ensure SUSEConnect is installed on SLES 16 (bsc#1235771)
  See also https://build.suse.de/requests/359397 .
 -------------------------------------------------------------------
 Thu Mar  6 16:23:54 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Ensure supportutils is installed on SLES 16 (bsc#1238894).
 -------------------------------------------------------------------
 Tue Mar  4 16:15:37 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Ensure btrfsmaintenance is required by transactional_base
  (bsc#1238405).
 -------------------------------------------------------------------
 Tue Mar  4 08:41:22 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Ensure less, sudo (bsc#1238409) and iputils (bsc#1238371) are 
  required in transactional_base pattern for SLFO.
 -------------------------------------------------------------------
 Mon Mar  3 10:02:25 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Ensure branding is also requires on SLFO / SLE16.
 -------------------------------------------------------------------
 Mon Mar  3 09:26:49 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
 - patterns-base-transactional_base: requires toolbox-branding-SLE
  on SL-Micro (bsc#1232346) 
 -------------------------------------------------------------------
 Thu Feb 27 14:48:09 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Disable x11 / x11_enhanced / basic_desktop on SLFO, we don't ship
  X11 server.
 - Disable 32bit patterns on SLFO.
 -------------------------------------------------------------------
 Wed Feb 26 14:21:46 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
 - Change some core packages to Requires [bsc#1237513]
 -------------------------------------------------------------------
 Fri Feb 21 13:36:23 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Only requires busybox on openSUSE MicroOS, not SL Micro.
 - Don't build apparmor pattern for SLFO.
 -------------------------------------------------------------------
 Thu Feb 13 13:32:24 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Disable 32bit pattern on aarch64 and ppc64le.
 - Build selinux pattern everywhere and requires targeted policy
  on SLE.
 -------------------------------------------------------------------
 Thu Feb  6 13:55:16 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
 - Merge MicroOS and SL Micro base patterns into existing base
  patterns.
 -------------------------------------------------------------------
 Thu Jan 16 12:52:36 UTC 2025 - Fabian Vogt <fvogt@suse.com>
 - selinux: Turn recommends for container-selinux into a hard but
  conditional dependency
 -------------------------------------------------------------------
 Thu Dec 19 13:12:09 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 - base: suggest tar to avoid busybox-tar in default installs
 -------------------------------------------------------------------
 Tue Nov 26 13:17:40 UTC 2024 - Dirk Müller <dmueller@suse.com>
 - fips: change description from 140-2 to 140-3
 - fips: require crypto-policies-scripts when openssh is used
  (bsc#1224802)
 - fips: drop -hmac packages as they have been merged into the main
  package (bsc#1185116)
 -------------------------------------------------------------------
 Tue Nov  5 16:29:38 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
 - Remove "Recommends: restorecond" from selinux pattern as we don't
  want it to be installed by default.
 -------------------------------------------------------------------
 Thu Oct 31 14:44:43 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
 - Agama does not install chrony, add it to the pattern like on all
  other products, so that it is always there, including on images.
 -------------------------------------------------------------------
 Thu Oct 24 07:10:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 - Remove openssl 1.0 related fips dependencies: openssl 1.0 is EOL
  and removed from Factory.
 -------------------------------------------------------------------
 Wed Oct 23 07:16:07 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 - In case of doubt, also favor libz1-32bit over libz-ng1-compat for
  the time being.
 -------------------------------------------------------------------
 Wed Oct 16 14:17:27 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
 - Add "Requires: selinux-policy-base" to selinux pattern so that
  selinux-policy-targeted will be installed on systems that disable
  "Recommends" (bsc#1231720)
 -------------------------------------------------------------------
 Thu Aug 29 13:57:22 UTC 2024 - Dominique Leuenberger <dleuenberger@suse.com>
 - Move suggests for libz1 from patterns-base-base to
  patterns-base-minimal_base: be nicer with CI consumers.
 -------------------------------------------------------------------
 Thu Aug 15 10:03:27 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
 - Remove nfsidmap, package got dropped
 - Remove nfs-client and autofs: in most scenarios, especially
  desktops, no longer used, but pull in many "deprecated" packages
 -------------------------------------------------------------------
 Tue Jun 25 11:30:33 UTC 2024 - Dirk Müller <dmueller@suse.com>
 - suggest the full libcurl4 package for zypper installation
 -------------------------------------------------------------------
 Mon Jun  3 18:40:33 UTC 2024 - Gordon Leung <pirateclip@protonmail.com>
--- a/patterns-base.spec
+++ b/patterns-base.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package patterns-base
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 %bcond_with betatest
 Name:           patterns-base
-Version:        20200505
+Version:        20241218
 Release:        0
 Summary:        Patterns for Installation (base patterns)
 License:        MIT
@@ -38,7 +38,9 @@ This particular package contains all the base / core patterns (and those that do
 ################################################################################
 # bsc#1088669 - only provide 32bit pattern for 64bit intel
 %if 0%{?is_opensuse}
 %ifarch x86_64
 %package 32bit
 %pattern_basetechnologies
@@ -57,9 +59,11 @@ This will install the 32-bit variant of all selected patterns. This allows to ex
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/32bit.txt
 %endif
 %endif
 ################################################################################
 %if 0%{?is_opensuse}
 %package apparmor
 %pattern_basetechnologies
 Summary:        AppArmor
@@ -74,7 +78,9 @@ Requires:       apparmor-profiles
 Requires:       pattern() = minimal_base
 Recommends:     apparmor-docs
 Recommends:     apparmor-utils
 %if 0%{?suse_version} > 1600
 Recommends:     yast2-apparmor
 %endif
 Suggests:       pam_apparmor
 %{obsolete_legacy_pattern apparmor}
 %if 0%{?is_opensuse}
@@ -89,6 +95,7 @@ AppArmor is an application security framework that provides mandatory access con
 %files apparmor
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/apparmor.txt
 %endif
 ################################################################################
@@ -120,6 +127,8 @@ Provides:       pattern-visible()
 Requires:       aaa_base
 Requires:       bash
 Requires:       ca-certificates-mozilla
 Requires:       ntp-daemon
 Suggests:       chrony
 Requires:       coreutils
 Requires:       coreutils-systemd
 Requires:       glibc
@@ -128,43 +137,61 @@ Requires:       pam
 Requires:       pam-config
 Requires:       pattern() = minimal_base
 # Support multiversion(kernel) (jsc#SLE-10162)
-Requires:       purge-kernels-service
+# FIXME remove if opensuse when package is in SLFO
 %if 0%{?is_opensuse}
 %{requires_on_traditional purge-kernels-service}
 %endif
 Requires:       rpm
 Requires:       system-user-nobody
 Requires:       systemd
 Requires:       util-linux
-# Add some static base tool in case system explodes; Recommend only, as users are free to uninstall it
+Requires:       user(nobody)
-Recommends:     busybox-static
+# Add some static base tool in case system explodes; Recommend only on traditional systems, as users are free to uninstall it
-Recommends:     elfutils
+%if 0%{?is_opensuse}
-Recommends:     glibc-locale-base
+%{requires_on_transactional busybox}
-Recommends:     hostname
+%endif
-Recommends:     iproute2
+%{recommends_on_traditional busybox-static}
-Recommends:     issue-generator
+%{recommends_on_traditional elfutils}
-Recommends:     lastlog2
+Requires:       glibc-locale-base
-Recommends:     pam_pwquality
+%{recommends_on_traditional hostname}
-Recommends:     shadow
+%{requires_on_transactional /usr/bin/hostname}
-Recommends:     system-group-trusted
+%{requires_on_transactional_recommends_otherwise iproute2}
-Recommends:     system-group-wheel
+%{recommends_on_traditional issue-generator}
-Recommends:     system-user-bin
+%{requires_on_transactional_recommends_otherwise lastlog2}
-Recommends:     system-user-daemon
+%if !0%{?is_opensuse}
-Recommends:     terminfo
+%{requires_on_transactional pam_pwquality}
-Recommends:     terminfo-iterm
+%else
-Recommends:     terminfo-screen
+%{recommends_on_traditional pam_pwquality}
-Recommends:     timezone
+%endif
-Recommends:     wtmpdb
+Requires:       shadow
-Recommends:     service(network)
+%{recommends_on_traditional system-group-trusted}
 %if !0%{?is_opensuse}
 %{requires_on_transactional system-group-wheel}
 %else
 %{recommends_on_traditional system-group-wheel}
 %endif
 %{recommends_on_traditional system-user-bin}
 %{recommends_on_traditional system-user-daemon}
 Requires:       terminfo-base
 %{recommends_on_traditional terminfo}
 %{recommends_on_traditional terminfo-iterm}
 %{recommends_on_traditional terminfo-screen}
 Requires:       timezone
 Requires:       wtmpdb
 %{recommends_on_traditional service(network)}
 %{requires_on_transactional NetworkManager}
 %if 0%{?is_opensuse}
 %{requires_on_transactional NetworkManager-bluetooth}
 %endif
 # We don't necessarily want zypper in specific minimal environments
 # e.g. buildroots and locked down appliance environments
-Recommends:     zypper
+%{recommends_on_traditional zypper}
-# We don't necessarily want procps but it's highly useful in default
+Requires:       procps
 # installations
 Recommends:     procps
 # If anything requests "kernel", pick the full kernel package by default
 Suggests:       kernel-default
 # we have two providers for 'pkgconfig(jack)' - prefer the real one to the one from pipewire
 Suggests:       libjack-devel
-# We have two providers for libz.so.1: libz1 and libz1-ng-compat1. Favor the legacy one for now
+# We have two providers for libcurl.so.4: libcurl4 and libcurl-mini4. Prefer the fully featured one
-Suggests:       libz1
+Suggests:       libcurl4
 # There are multiple providers for /usr/bin/openssl and openssl(cli); defaulting to openssl
 Suggests:       openssl
 # In line with above: the default openssl version is 1.1 for now; at the moment, the meta package does not provide all symbols needed
@@ -173,6 +200,8 @@ Suggests:       openssl-1_1
 Suggests:       postfix
 # We have two providers of psmisc, favour the regular one (not the busybox one)
 Suggests:       psmisc
 # rather than busybox-tar
 Suggests:       tar
 # we have two providers for 'pulseaudio' - prefer pipewire or pipewire depending on suse_version
 # we have two providers for 'service(network)' - prefer NM or wicked depending on suse_version
 %if 0%{?suse_version} > 1500
@@ -189,7 +218,7 @@ Suggests:       xz
 %if %{with betatest}
 Requires:       aaa_base-malloccheck
 %endif
-%if 0%{?sle_version}
+%if !0%{?is_opensuse}
 Recommends:     SUSEConnect
 Recommends:     btrfsprogs
 # SLES users expect all FS tools to be installed
@@ -214,6 +243,7 @@ This is the base runtime system.  It contains only a basic multiuser booting sys
 # This pattern contains everything the SLES x11 package used to have that
 # doesn't need to be in the openSUSE x11 package
 %if 0%{?is_opensuse}
 %package basic_desktop
 %pattern_graphicalenvironments
 Summary:        A basic desktop (based on IceWM)
@@ -238,6 +268,7 @@ This pattern installs a rather basic desktop (icewm)
 %files basic_desktop
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/basic_desktop.txt
 %endif
 ################################################################################
@@ -314,7 +345,7 @@ Recommends:     pam-manpages
 %{obsolete_legacy_pattern documentation}
 %description documentation
-Help and Support Documentation
+Man tool and Man pages for various tools and POSIX API.
 %files documentation
 %dir %{_docdir}/patterns
@@ -322,6 +353,27 @@ Help and Support Documentation
 ################################################################################
 %package kdump
 %pattern_basetechnologies
 Summary:        Kernel dump tooling
 Group:          Metapackages
 Provides:       pattern() = kdump
 Provides:       pattern-icon() = pattern-basis
 Provides:       pattern-order() = 1005
 Provides:       pattern-visible()
 Requires:       kdump
 Recommends:     (cockpit-kdump if cockpit)
 Requires:       pattern() = minimal_base
 %description kdump
 Tools used to trigger and handle kernel dump (kdump).
 %files kdump
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/kdump.txt
 ################################################################################
 %package enhanced_base
 %pattern_basetechnologies
 Summary:        Enhanced Base System
@@ -334,15 +386,18 @@ Requires:       pattern() = base
 %if 0%{?is_opensuse}
 Recommends:     pattern() = documentation
 Recommends:     pattern() = sw_management
 %if 0%{?suse_version} > 1600
 Recommends:     pattern() = yast2_basis
 %endif
 %else
 Recommends:     pattern() = kdump
 %endif
 Requires:       openssh
 Recommends:     aaa_base-extras
 # getfacl and setfacl
 Recommends:     acl
 # getattr and setattr
 Recommends:     attr
 Recommends:     autofs
 Recommends:     bash-completion
 Recommends:     bind-utils
 # compressor is interesting
@@ -391,6 +446,8 @@ Recommends:     krb5
 Recommends:     less
 Recommends:     logrotate
 Recommends:     lsscsi
 # lvm2 should be there by default (#1239784)
 Recommends:     lvm2
 # man by default (#304687)
 Recommends:     man
 # needed for detecting software raid - required by yast2-storage too
@@ -401,8 +458,6 @@ Recommends:     ncurses-utils
 Recommends:     net-snmp
 Recommends:     netcat-openbsd
 Recommends:     netcfg
 Recommends:     nfs-client
 Recommends:     nfsidmap
 # Kernel 5.15+ has an improved R/W ntfs module.
 # Use ntfs-3g anyway because udisks has issues with mount option handling:
 # https://github.com/storaged-project/udisks/issues/932
@@ -419,7 +474,11 @@ Recommends:     pciutils-ids
 Recommends:     perl-Bootloader
 Recommends:     perl-base
 Recommends:     pinentry
 %ifarch s390x
 Recommends:     blog-plymouth
 %else
 Recommends:     plymouth
 %endif
 # fuser (psmisc) by default (#304694)
 Recommends:     psmisc
 Recommends:     rsync
@@ -428,6 +487,9 @@ Recommends:     sed
 Recommends:     sg3_utils
 Recommends:     smartmontools
 Recommends:     sudo
 %if !0%{?is_opensuse}
 Recommends:     supportutils
 %endif
 Recommends:     systemd-coredump
 Recommends:     time
 Recommends:     timezone
@@ -448,7 +510,7 @@ Suggests:       pam_ssh
 Suggests:       xfsprogs
 Suggests:       zip
 %{obsolete_legacy_pattern enhanced_base}
-%if 0%{?sle_version}
+%if !0%{?is_opensuse}
 # in SLE we still want /var/log/messages as all of the docu refers to it
 # TODO: if we still want it everywhere it should move back to base
 Recommends:     rsyslog
@@ -484,7 +546,6 @@ Recommends:     procmail
 Recommends:     providers
 # fuser (psmisc) by default (#304694)
 Recommends:     psmisc
 Recommends:     setserial
 Recommends:     sharutils
 Recommends:     smp_utils
 Recommends:     spax
@@ -544,29 +605,18 @@ This is the enhanced base runtime system with lots of convenience packages.
 ################################################################################
 %package fips
-%pattern_primaryfunctions
+%pattern_basetechnologies
-Summary:        FIPS 140-2 specific packages
+Summary:        FIPS 140-3 specific packages
 Group:          Metapackages
 Provides:       pattern() = fips
 Provides:       pattern-icon() = pattern-basis-addon
 Provides:       pattern-order() = 3010
 Provides:       pattern-visible()
 Requires:       (crypto-policies-scripts if openssh-clients)
 Requires:       (crypto-policies-scripts if openssh-common)
 Requires:       (crypto-policies-scripts if openssh-server)
 Requires:       (dracut-fips if dracut)
 Requires:       (libcryptsetup12-hmac if libcryptsetup12)
 Requires:       (libcryptsetup12-hmac-32bit if libcryptsetup12-32bit)
 Requires:       (libfreebl3-hmac if libfreebl3)
 Requires:       (libfreebl3-hmac-32bit if libfreebl3-32bit)
 Requires:       (libgcrypt20-hmac if libgcrypt20)
 Requires:       (libgnutls30-hmac if libgnutls30)
 Requires:       (libgnutls30-hmac-32bit if libgnutls30-32bit)
 Requires:       (libopenssl-3-fips-provider if libopenssl3)
 Requires:       (libopenssl-fips-provider if libopenssl)
 Requires:       (libopenssl1_0_0-hmac if libopenssl1_0_0)
 Requires:       (libopenssl1_0_0-hmac-32bit if libopenssl1_0_0-32bit)
 Requires:       (libopenssl1_1-hmac if libopenssl1_1)
 Requires:       (libopenssl1_1-hmac-32bit if libopenssl1_1-32bit)
 Requires:       (libsoftokn3-hmac if libsoftokn3)
 Requires:       (libsoftokn3-hmac-32bit if libsoftokn3-32bit)
 Requires:       (openssh-fips if openssh-clients)
 Requires:       (openssh-fips if openssh-server)
 Requires:       (strongswan-hmac if strongswan)
@@ -578,14 +628,13 @@ Provides:       patterns-server-enterprise-fips-32bit = %{version}
 Obsoletes:      patterns-server-enterprise-fips-32bit < %{version}
 %description fips
-This pattern installs the FIPS 140-2 specific packages that complete the various
+This pattern installs the FIPS 140-3 specific packages that are required
-cryptographic modules in use. It is required if you want to run the
+if you want to run the machine with "fips=1".
 machine with "fips=1".
-Please note that this pattern only enables FIPS 140-2 compliant operation, it does
+Please note that this pattern only enables FIPS 140-3 compliant operation, it does
-not directly make the system FIPS 140-2 certified nor validated.
+not directly make the system FIPS 140-3 certified nor validated.
-Please refer to SUSE official statements on the state of FIPS 140-2 certification.
+Please refer to SUSE official statements on the state of FIPS 140-3 certification.
 %files fips
 %dir %{_docdir}/patterns
@@ -607,6 +656,9 @@ Requires:       branding
 Requires:       build-key
 Requires:       distribution-release
 Requires:       filesystem
 # We have two providers for libz.so.1: libz1 and libz1-ng-compat1. Favor the legacy one for now
 Suggests:       libz1
 Suggests:       libz1-32bit
 # Tell the solver to default to the main product
 Suggests:       openSUSE-release
 %{obsolete_legacy_pattern minimal_base}
@@ -637,7 +689,7 @@ Requires:       biosdevname
 %if 0%{?is_opensuse}
 Requires:       (grub2-branding-openSUSE if branding-openSUSE)
 %else
-%if 0%{?sle_version}
+%if !0%{?is_opensuse}
 Requires:       (grub2-branding-SLE if branding-SLE)
 %endif
 %endif
@@ -666,10 +718,33 @@ This pattern holds files required for booting the system
 ################################################################################
-%if 0%{?is_opensuse}
+%if !0%{?is_opensuse} && 0%{?suse_version} >= 1600
 %package kernel_livepatching
 %pattern_basetechnologies
 Summary:        Kernel Livepatching
 Group:          Metapackages
 Provides:       pattern() = kernel_livepatching
 %ifarch x86_64 ppc64le s390x
 Requires:       kernel-livepatch-tools
 Requires:       (kernel-default-livepatch if kernel-default)
 %endif
 %ifarch x86_64
 Requires:       (kernel-rt-livepatch if kernel-rt)
 %endif
 %description kernel_livepatching
 This pattern holds files required for kernel livepatching
 %files kernel_livepatching
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/kernel_livepatching.txt
 %endif
 ################################################################################
 %package selinux
 %pattern_basetechnologies
-Summary:        SELinux
+Summary:        SELinux Support
 Group:          Metapackages
 Provides:       pattern() = selinux
 Provides:       pattern-icon() = pattern-selinux
@@ -678,12 +753,19 @@ Provides:       pattern-visible()
 Requires:       policycoreutils
 Requires:       selinux-autorelabel
 Requires:       selinux-policy
 %if 0%{?is_opensuse}
 Requires:       selinux-policy-base
 # Use targeted as default policy if none was explicitly requested.
 Suggests:       selinux-policy-targeted
 %else
 Requires:       selinux-policy-targeted
 %endif
 Requires:       selinux-tools
 Requires:       pattern() = minimal_base
 # Needed for podman et al.
 Requires:       (container-selinux if libcontainers-common)
 Recommends:     checkpolicy
 Recommends:     container-selinux
 Recommends:     restorecond
 Recommends:     selinux-policy-targeted
 %description selinux
 Security-Enhanced Linux (SELinux) provides a mechanism for supporting access control security policies, including mandatory access controls (MAC).
@@ -692,7 +774,6 @@ Its architecture strives to separate enforcement of security decisions from the
 %files selinux
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/selinux.txt
 %endif
 ################################################################################
@@ -705,9 +786,14 @@ Provides:       pattern-icon() = pattern-software-management
 Provides:       pattern-order() = 1360
 Provides:       pattern-visible()
 Recommends:     pattern() = sw_management_x11
-%if 0%{?sle_version}
+%if !0%{?is_opensuse}
 Recommends:     cockpit-packages
 Recommends:     lifecycle-data
 Recommends:     suse-lifecycle
 Recommends:     zypper-lifecycle-plugin
 Recommends:     (suse-lifecycle-data-sle_ha if sle-ha-release)
 Recommends:     (suse-lifecycle-data-sles if SLES-release)
 Recommends:     (suse-lifecycle-data-sles_sap if SLES_SAP-release)
 %endif
 # Zypper is the basic sw_management stack for *SUSE
 Requires:       zypper
@@ -722,6 +808,8 @@ This pattern provides a graphical application and a command line tool for keepin
 ################################################################################
 # Do not build it on Leap 16
 %if !(0%{?is_opensuse} && 0%{?suse_version} == 1600) || 0%{?is_leapmicro}
 %package transactional_base
 %pattern_basetechnologies
 Summary:        Transactional Base System
@@ -729,13 +817,76 @@ Group:          Metapackages
 Provides:       pattern() = transactional_base
 Provides:       pattern-icon() = pattern-kubic
 Provides:       pattern-order() = 1050
 Requires:       /usr/bin/gzip
 Requires:       btrfsmaintenance
 Requires:       less
 Requires:       openssh
 Requires:       read-only-root-fs
 Requires:       rebootmgr
-Requires:       systemd-presets-branding-transactional-server
+Requires:       sudo
 Requires:       yast2-logs
 Requires:       zypp-boot-plugin
 Requires:       (health-checker if grub2)
 Requires:       (health-checker-plugins-MicroOS if health-checker)
 # FIXME
 %if 0%{?is_opensuse}
 Requires:       MicroOS-release
 Requires:       systemd-presets-branding-MicroOS
 Suggests:       busybox-gzip
 # tpm2 tools are required for FDE+TPM
 Requires:       tpm2-0-tss
 Requires:       libtss2-tcti-device0
 Requires:       tpm2.0-tools
 # probably needed for fsck.fat on efi partitions
 Requires:       dosfstools
 %else
 Requires:       iputils
 Requires:       supportutils
 Requires:       systemd-presets-branding-ALP-transactional
 Requires:       toolbox
 Requires:       toolbox-branding-SLE
 Requires:       group(wheel)
 # zypper ps is useless in transactional mode. It also checks for
 # /run/reboot-needed though which is created by transactional-update
 Requires:       zypper-needs-restarting
 # jsc#PED-6478 (2 packages)
 Requires:       mailx
 Requires:       systemd-status-mail
 # jsc#SMO-79
 Requires:       tpm2.0-tools
 Requires:       tpm2-0-tss
 Requires:       tpm2-tss-engine
 Requires:       tpm2.0-abrmd
 # jsc#SMO-50
 %ifarch x86_64 aarch64
 Requires:       libmbim
 Requires:       libmbim-glib4
 Requires:       libqmi-glib5
 Requires:       libqmi-tools
 %endif
 # jsc#CSD-121
 Requires:       udica
 # jsc#SMO-120
 Requires:       pam_u2f
 %ifarch s390x
 Requires:       libica
 Requires:       openCryptoki
 Requires:       openssl-ibmca
 %endif
 # bsc#1217991
 #FIXME
 Requires:       crypto-policies-scripts
 %endif
 Requires:       transactional-update
 Requires:       transactional-update-zypp-config
 # Useful outside of MicroOS and needed for e.g. SELinux relabelling
 Requires:       microos-tools
 %ifnarch %{arm}
 Requires:       kdump
 %endif
 Requires:       vim-small
 Requires:       pattern() = base
 Suggests:       health-checker
@@ -745,6 +896,7 @@ This is the base system for a host updated by Transactional Updates. Includes To
 %files transactional_base
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/transactional_base.txt
 %endif
 ################################################################################
@@ -775,6 +927,7 @@ Packages used for testing that the update stack works.  These tiny packages do n
 ################################################################################
 %if 0%{?is_opensuse}
 %package x11
 %pattern_graphicalenvironments
 Summary:        X Window System
@@ -836,11 +989,17 @@ Provides:       pattern-order() = 1801
 Recommends:     pattern() = yast2_basis
 Recommends:     pattern() = yast2_server
 %endif
 # Myrlyn replaces YaST software management code-o-o#leap/features#173
 %if 0%{?is_opensuse}
 Recommends:     myrlyn
 %endif
 Requires:       pattern() = enhanced_base
 Requires:       pattern() = fonts
 Requires:       pattern() = x11
 %if 0%{?suse_version} > 1600
 Recommends:     pattern() = x11_yast
 Recommends:     pattern() = yast2_desktop
 %endif
 # 1057377
 Requires:       glibc-locale
 Requires:       glibc-locale-base
@@ -869,10 +1028,12 @@ Recommends:     xdmbgrd
 Recommends:     xkeyboard-config
 Recommends:     xorg-x11-fonts
 Recommends:     xorg-x11-fonts-core
 %if 0%{?suse_version} > 1600
 Recommends:     yast2-control-center-gnome
 # Recommend yast2-network until the Generic Desktop Role defaults to NetworkManager
 # At worst people need a way to switch from Wicked to NetworkManager.
 Recommends:     yast2-network
 %endif
 # This will install Firefox if no other browser is selected
 Suggests:       MozillaFirefox
 Suggests:       MozillaFirefox-translations
@@ -967,7 +1128,6 @@ Requires:       xeyes
 # Drivers
 Requires:       xf86-input-evdev
 Requires:       xf86-input-libinput
 Requires:       xf86-video-fbdev
 Requires:       xfd
 Requires:       xfontsel
 Requires:       xgamma
@@ -999,18 +1159,18 @@ Requires:       xscope
 Requires:       xscreensaver
 Requires:       xscreensaver-data
 Requires:       xset
 Requires:       xsetmode
 Requires:       xsetpointer
 Requires:       xsetroot
 Requires:       xterm
 Requires:       xtermset
 Requires:       xvinfo
 Requires:       xwd
 Requires:       xwininfo
 %if 0%{?suse_version} > 1600
 Requires:       yast2-control-center-qt
 Requires:       yast2-packager
 Requires:       yast2-snapper
 Requires:       yast2-x11
 %endif
 # Branding
 %if ! 0%{?is_opensuse}
 Requires:       MozillaFirefox-branding-SLE
@@ -1023,6 +1183,7 @@ The X Window System provides the only standard platform-independent networked gr
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/x11_raspberrypi.txt
 %endif
 %endif
 ################################################################################
@@ -1032,38 +1193,53 @@ The X Window System provides the only standard platform-independent networked gr
 %install
 mkdir -p %{buildroot}%{_docdir}/patterns
-for i in apparmor base enhanced_base minimal_base sw_management x11 x11_enhanced; do
+for i in \
 %if 0%{?is_opensuse}
 apparmor x11 x11_enhanced \
 %endif
 base enhanced_base minimal_base sw_management; do
    echo "This file marks the pattern $i to be installed." \
    >"%{buildroot}%{_docdir}/patterns/$i.txt"
 %if 0%{?is_opensuse}
    echo "This file marks the pattern $i to be installed." \
    >"%{buildroot}%{_docdir}/patterns/$i-32bit.txt"
 %endif
 done
 # These packages don't generate a 32bit pattern
-for i in basesystem bootloader basic_desktop documentation fips transactional_base \
+for i in basesystem bootloader documentation fips selinux kdump \
 %if !(0%{?is_opensuse} && 0%{?suse_version} == 1600) || 0%{?is_leapmicro}
 transactional_base \
 %endif
 %if !0%{?is_opensuse} && 0%{?suse_version} >= 1600
 kernel_livepatching \
 %endif
 %if 0%{?is_opensuse}
-console selinux update_test \
+console update_test basic_desktop \
 %else
 %ifnarch s390 s390x
 32bit \
 %endif
 %endif
 %ifarch armv6hl armv7hl aarch64
 x11_raspberrypi \
 %endif
 %ifarch x86_64
 32bit \
 %endif
 %endif
 ; do
    echo "This file marks the pattern $i to be installed." \
    >"%{buildroot}%{_docdir}/patterns/$i.txt"
 done
 %if 0%{?is_opensuse}
 %ifarch x86_64
 echo "This file marks the pattern 32bit to be installed." \
 >"%{buildroot}%{_docdir}/patterns/32bit.txt"
 %endif
 %endif
 #
 # This file is created at check-in time. Sorry for the inconsistent workflow :(
 #
 %if 0%{?is_opensuse}
 %include %{SOURCE1}
 %endif
 %changelog