From 91ad28ede3e3f7c2e4ce824fc29b2d96df144a46471adfb861c8d6534211aecd Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Tue, 2 Apr 2013 15:33:04 +0000 Subject: [PATCH] - add conflicts between krb5-mini and krb5 and krb5-client - add conflicts between krb5-mini and krb5 and krb5-client OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=94 --- krb5-mini.changes | 5 +++++ krb5-mini.spec | 6 +++++- krb5.changes | 5 +++++ krb5.spec | 6 +++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index e41b807..49f3577 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 2 17:32:08 CEST 2013 - mc@suse.de + +- add conflicts between krb5-mini and krb5 and krb5-client + ------------------------------------------------------------------- Wed Mar 27 11:36:00 CET 2013 - mc@suse.de diff --git a/krb5-mini.spec b/krb5-mini.spec index bf60786..0ac013f 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -51,7 +51,10 @@ BuildRequires: pkgconfig(systemd) %ifarch ppc64 Obsoletes: krb5-64bit %endif -# +Conflicts: krb5-mini +%else # -mini +Conflicts: krb5 +Conflicts: krb5-client %endif Source: krb5-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -84,6 +87,7 @@ practice of clear text passwords. %if ! %{build_mini} %package client +Conflicts: krb5-mini Summary: MIT Kerberos5 implementation - client programs Group: Productivity/Networking/Security diff --git a/krb5.changes b/krb5.changes index e41b807..49f3577 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 2 17:32:08 CEST 2013 - mc@suse.de + +- add conflicts between krb5-mini and krb5 and krb5-client + ------------------------------------------------------------------- Wed Mar 27 11:36:00 CET 2013 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index bf17262..708846b 100644 --- a/krb5.spec +++ b/krb5.spec @@ -51,7 +51,10 @@ BuildRequires: pkgconfig(systemd) %ifarch ppc64 Obsoletes: krb5-64bit %endif -# +Conflicts: krb5-mini +%else # -mini +Conflicts: krb5 +Conflicts: krb5-client %endif Source: krb5-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -84,6 +87,7 @@ practice of clear text passwords. %if ! %{build_mini} %package client +Conflicts: krb5-mini Summary: MIT Kerberos5 implementation - client programs Group: Productivity/Networking/Security