From 9ea261b5500920045c8158cdc80f9dca5fbd6c7984397af02d64384634a81dd4 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 15 May 2019 09:38:34 +0000 Subject: [PATCH] - do not use openssl-1_1-hmac in openSUSE for now OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1225 --- installation-images.changes | 5 +++++ installation-images.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/installation-images.changes b/installation-images.changes index 45485b2..a74ebc0 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 15 09:37:20 UTC 2019 - Steffen Winterfeldt + +- do not use openssl-1_1-hmac in openSUSE for now + -------------------------------------------------------------------- Fri May 3 08:47:53 UTC 2019 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index ce9de92..9120abc 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -31,6 +31,7 @@ ExclusiveArch: do_not_build %define with_shim 1 %define with_storage_ng 1 %define with_reiserfs_kmp 0 +%define with_ssl_hmac 1 %bcond_without sbl %bcond_without vnc %bcond_with xen @@ -124,6 +125,7 @@ ExclusiveArch: do_not_build %if "%theme" == "openSUSE" %define with_storage_ng 1 +%define with_ssl_hmac 0 %define branding_skelcd openSUSE %define branding_systemd openSUSE %define branding_plymouth openSUSE @@ -135,6 +137,7 @@ BuildRequires: adobe-sourcesanspro-fonts %if "%theme" == "Kubic" %define with_storage_ng 1 +%define with_ssl_hmac 0 %define branding_skelcd Kubic %define branding_systemd MicroOS %define branding_plymouth openSUSE @@ -147,6 +150,7 @@ BuildRequires: adobe-sourcesanspro-fonts %if "%theme" == "MicroOS" %define with_storage_ng 1 +%define with_ssl_hmac 0 %define branding_skelcd MicroOS %define branding_systemd MicroOS %define branding_plymouth openSUSE @@ -329,7 +333,9 @@ BuildRequires: khmeros-fonts BuildRequires: kmod-compat BuildRequires: krb5-devel BuildRequires: less +%if %with_ssl_hmac BuildRequires: libopenssl1_1-hmac +%endif BuildRequires: libpcsclite1 BuildRequires: libyui-ncurses-pkg BuildRequires: libyui-qt