From 4d4a31fec0571d8291a4de9d2f5f386a11c60e4872bb1ec609c9a00e5b826e07 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 4 Jul 2018 07:19:08 +0000 Subject: [PATCH] Accepting request 619019 from home:AndreasStieger:branches:network - BuildRequire pkgconfig(krb5) instead of krb5-mini-devel to ensure zypper si can pick a resolvable provider. Build cycle remains solved via project config pulling in -mini. (bsc#1099044) OBS-URL: https://build.opensuse.org/request/show/619019 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=147 --- openssh.changes | 7 +++++++ openssh.spec | 12 +----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/openssh.changes b/openssh.changes index 82d0ad0..6d2a030 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 25 20:30:16 UTC 2018 - astieger@suse.com + +- BuildRequire pkgconfig(krb5) instead of krb5-mini-devel to ensure + zypper si can pick a resolvable provider. Build cycle remains + solved via project config pulling in -mini. (bsc#1099044) + ------------------------------------------------------------------- Mon May 21 15:19:03 UTC 2018 - pcerny@suse.com diff --git a/openssh.spec b/openssh.spec index 918aed3..80772c4 100644 --- a/openssh.spec +++ b/openssh.spec @@ -45,12 +45,6 @@ %define needs_libedit 0 %endif -%if 0%{?suse_version} > 1140 -%define has_krb_mini 1 -%else -%define has_krb_mini 0 -%endif - %if 0%{?suse_version} > 1220 %define uses_systemd 1 %else @@ -75,11 +69,7 @@ Name: openssh BuildRequires: audit-devel BuildRequires: autoconf BuildRequires: groff -%if %{has_krb_mini} -BuildRequires: krb5-mini-devel -%else -BuildRequires: krb5-devel -%endif +BuildRequires: pkgconfig(krb5) %if %{needs_libedit} BuildRequires: libedit-devel %endif