Accepting request 1061577 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/1061577
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=176

installation-images-17.69.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e9d67cbbe4076ce220d5f32045a1448623b666ea1cc00f0bade05f283658ba6
-size 244472

installation-images-17.70.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de9969a29af6b1fb64a7c1bb522beaf3b69d3f26e393373775d4597915e393d9
+size 244604

installation-images.changes

@@ -1,3 +1,11 @@
+--------------------------------------------------------------------
+Fri Jan 27 15:16:26 UTC 2023 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#622
+- introduce with_fips in spec file to control fips support
+  (bsc#1207576)
+- 17.70
+
 --------------------------------------------------------------------
 Wed Jan 25 16:42:39 UTC 2023 - wfeldt@opensuse.org
 

installation-images.spec

@@ -40,7 +40,7 @@ ExclusiveArch:  do_not_build
 %define with_plymouth 1
 %define with_shim 1
 %define with_storage_ng 1
-%define with_ssl_hmac 1
+%define with_fips 1
 %define with_exfat 0
 %define with_kernel_extra 0
 %bcond_without sbl
@@ -157,7 +157,7 @@ ExclusiveArch:  do_not_build
 
 %if "%theme" == "openSUSE"
 %define with_storage_ng 1
-%define with_ssl_hmac 0
+%define with_fips 0
 %define branding_skelcd   openSUSE
 %define branding_systemd  openSUSE
 %define branding_plymouth openSUSE
@@ -175,7 +175,7 @@ BuildRequires:  distribution-logos-openSUSE-Leap
 
 %if "%theme" == "SMO" || "%theme" == "LeapMicro"
 %define with_storage_ng 1
-%define with_ssl_hmac 0
+%define with_fips 0
 %define branding_skelcd   SMO
 %define branding_systemd  SMO
 %if "%theme" == "LeapMicro"
@@ -197,7 +197,7 @@ BuildRequires:  system-group-kvm
 
 %if "%theme" == "MicroOS"
 %define with_storage_ng 1
-%define with_ssl_hmac 0
+%define with_fips 0
 %define branding_skelcd   MicroOS
 %define branding_systemd  MicroOS
 %define branding_plymouth openSUSE
@@ -329,7 +329,6 @@ BuildRequires:  dejavu-fonts
 BuildRequires:  dhcp-server
 BuildRequires:  dmraid
 BuildRequires:  dosfstools
-BuildRequires:  dracut-fips
 BuildRequires:  dump
 BuildRequires:  e2fsprogs
 BuildRequires:  ed
@@ -382,7 +381,9 @@ BuildRequires:  khmeros-fonts
 BuildRequires:  kmod-compat
 BuildRequires:  krb5-devel
 BuildRequires:  less
-%if %with_ssl_hmac
+%if %with_fips
+BuildRequires:  dracut-fips
+BuildRequires:  openssh-fips
 BuildRequires:  libopenssl1_1-hmac
 %endif
 BuildRequires:  libpcsclite1
@@ -418,7 +419,6 @@ BuildRequires:  open-iscsi
 BuildRequires:  openldap2-client
 BuildRequires:  openslp-server
 BuildRequires:  openssh
-BuildRequires:  openssh-fips
 BuildRequires:  pango
 BuildRequires:  pango-tools
 BuildRequires:  parted
@@ -664,7 +664,7 @@ AutoReqProv:    off
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0-or-later
 Group:          Metapackages
-Version:        17.69
+Version:        17.70
 Release:        0
 Provides:       installation-images = %version-%release
 Conflicts:      otherproviders(installation-images)