From 784245ce5a9ac6c3ce6f2d29a2596e009fa0478cc0da95088c1fe6b98e0c2fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 9 Jan 2018 14:34:06 +0000 Subject: [PATCH] - Fix the conflict to the rtslib properly OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rtslib-fb?expand=0&rev=27 --- python-rtslib-fb.changes | 5 +++++ python-rtslib-fb.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/python-rtslib-fb.changes b/python-rtslib-fb.changes index 821199c..45bd3b6 100644 --- a/python-rtslib-fb.changes +++ b/python-rtslib-fb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 9 14:37:15 UTC 2018 - tchvatal@suse.com + +- Fix the conflict to the rtslib properly + ------------------------------------------------------------------- Wed Jan 3 16:13:57 UTC 2018 - tchvatal@suse.com diff --git a/python-rtslib-fb.spec b/python-rtslib-fb.spec index f742c8c..2feffc9 100644 --- a/python-rtslib-fb.spec +++ b/python-rtslib-fb.spec @@ -19,6 +19,7 @@ %define oname rtslib-fb %define realver 2.1.fb64 %define dbdir %{_sysconfdir}/target +%define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-%{oname} Version: 2.1.64 @@ -37,7 +38,7 @@ BuildRequires: python-rpm-macros Requires: python-pyudev Requires(post): update-alternatives Requires(postun): update-alternatives -Conflicts: python-rtslib +Conflicts: %{oldpython}-rtslib BuildArch: noarch %python_subpackages