From dd5e002fc00ab186791bb7436cbc7b10912d1c71db6d7d5bc4396ce5775eefc4 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 16 Aug 2021 05:52:31 +0000 Subject: [PATCH] - Conflict with sl, we both provide the same file. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-softlayer?expand=0&rev=22 --- python-softlayer.changes | 3 ++- python-softlayer.spec | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python-softlayer.changes b/python-softlayer.changes index 05f7cb1..75ad770 100644 --- a/python-softlayer.changes +++ b/python-softlayer.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Aug 13 06:05:11 UTC 2021 - Steve Kowalik +Mon Aug 16 05:51:52 UTC 2021 - Steve Kowalik - Update to 5.9.7: * Fix the network space is empty on subnet detail #1523 @@ -43,6 +43,7 @@ Fri Aug 13 06:05:11 UTC 2021 - Steve Kowalik * #1318 add Drive number in guest drives details using the device number * #1323 add vs list hardware and all option - Skip one test, so we don't require tkinter. +- Conflict with sl, we both provide the same file. ------------------------------------------------------------------- Wed Jul 29 07:47:04 UTC 2020 - Marketa Calabkova diff --git a/python-softlayer.spec b/python-softlayer.spec index d99c107..e4f99aa 100644 --- a/python-softlayer.spec +++ b/python-softlayer.spec @@ -46,6 +46,7 @@ Requires: python-requests >= 2.20.0 Requires: python-setuptools Requires: python-six >= 1.7.0 Requires: python-urllib3 >= 1.24 +Conflicts: sl Requires(post): update-alternatives Requires(postun):update-alternatives %python_subpackages