pool/installation-images
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- do not use openssl-1_1-hmac in openSUSE for now

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1225
This commit is contained in:
Steffen Winterfeldt 2019-05-15 09:38:34 +00:00 committed by Git OBS Bridge
parent 7a7d5abe3f
commit 9ea261b550
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
installation-images.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 15 09:37:20 UTC 2019 - Steffen Winterfeldt <snwint@suse.com>
- do not use openssl-1_1-hmac in openSUSE for now
-------------------------------------------------------------------- --------------------------------------------------------------------
Fri May 3 08:47:53 UTC 2019 - wfeldt@opensuse.org Fri May 3 08:47:53 UTC 2019 - wfeldt@opensuse.org

6
installation-images.spec
View File

@ -31,6 +31,7 @@ ExclusiveArch: do_not_build
%define with_shim 1 %define with_shim 1
%define with_storage_ng 1 %define with_storage_ng 1
%define with_reiserfs_kmp 0 %define with_reiserfs_kmp 0
%define with_ssl_hmac 1
%bcond_without sbl %bcond_without sbl
%bcond_without vnc %bcond_without vnc
%bcond_with xen %bcond_with xen
@ -124,6 +125,7 @@ ExclusiveArch: do_not_build
%if "%theme" == "openSUSE" %if "%theme" == "openSUSE"
%define with_storage_ng 1 %define with_storage_ng 1
%define with_ssl_hmac 0
%define branding_skelcd openSUSE %define branding_skelcd openSUSE
%define branding_systemd openSUSE %define branding_systemd openSUSE
%define branding_plymouth openSUSE %define branding_plymouth openSUSE
@ -135,6 +137,7 @@ BuildRequires: adobe-sourcesanspro-fonts
%if "%theme" == "Kubic" %if "%theme" == "Kubic"
%define with_storage_ng 1 %define with_storage_ng 1
%define with_ssl_hmac 0
%define branding_skelcd Kubic %define branding_skelcd Kubic
%define branding_systemd MicroOS %define branding_systemd MicroOS
%define branding_plymouth openSUSE %define branding_plymouth openSUSE
@ -147,6 +150,7 @@ BuildRequires: adobe-sourcesanspro-fonts
%if "%theme" == "MicroOS" %if "%theme" == "MicroOS"
%define with_storage_ng 1 %define with_storage_ng 1
%define with_ssl_hmac 0
%define branding_skelcd MicroOS %define branding_skelcd MicroOS
%define branding_systemd MicroOS %define branding_systemd MicroOS
%define branding_plymouth openSUSE %define branding_plymouth openSUSE
@ -329,7 +333,9 @@ BuildRequires: khmeros-fonts
BuildRequires: kmod-compat BuildRequires: kmod-compat
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: less BuildRequires: less
%if %with_ssl_hmac
BuildRequires: libopenssl1_1-hmac BuildRequires: libopenssl1_1-hmac
%endif
BuildRequires: libpcsclite1 BuildRequires: libpcsclite1
BuildRequires: libyui-ncurses-pkg BuildRequires: libyui-ncurses-pkg
BuildRequires: libyui-qt BuildRequires: libyui-qt