From 918663decd00c9ce278691d3113f6d628fa255766d95bfe5b0547d05472bfe98 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Mar 2016 09:27:08 +0000 Subject: [PATCH] - add conflicts to python-kerberos OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pykerberos?expand=0&rev=2 --- python-pykerberos.changes | 5 +++++ python-pykerberos.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python-pykerberos.changes b/python-pykerberos.changes index 78441fd..956ae2d 100644 --- a/python-pykerberos.changes +++ b/python-pykerberos.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 14 09:26:57 UTC 2016 - dmueller@suse.com + +- add conflicts to python-kerberos + ------------------------------------------------------------------- Tue Feb 9 14:31:33 UTC 2016 - tbechtold@suse.com diff --git a/python-pykerberos.spec b/python-pykerberos.spec index cbb1469..4ff3a89 100644 --- a/python-pykerberos.spec +++ b/python-pykerberos.spec @@ -1,7 +1,7 @@ # # spec file for package python-pykerberos # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,19 +13,22 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: python-pykerberos Version: 1.1.10 Release: 0 -License: Apache-2.0 Summary: High-level interface to Kerberos -Url: https://github.com/02strich/pykerberos/ +License: Apache-2.0 Group: Development/Languages/Python +Url: https://github.com/02strich/pykerberos/ Source: https://pypi.python.org/packages/source/p/pykerberos/pykerberos-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: pkgconfig(krb5) +# https://github.com/02strich/pykerberos/issues/17 +Conflicts: python-kerberos Requires: krb5 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110