From decf578c3fbb1700697413629c5697b244459270d36856ee2a0972d99845d1e1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 13 Dec 2019 13:42:48 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/shared-python-startup revision 3.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/shared-python-startup?expand=0&rev=2aabc27822cf2cb6ebc61301d1e8c528 --- shared-python-startup.changes | 6 ------ shared-python-startup.spec | 6 ------ 2 files changed, 12 deletions(-) diff --git a/shared-python-startup.changes b/shared-python-startup.changes index 7ee2521..b82bb16 100644 --- a/shared-python-startup.changes +++ b/shared-python-startup.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Dec 4 18:17:30 CET 2019 - Matej Cepl - -- Setup Conflicts: so that older version of Python don’t collide - with this package. - ------------------------------------------------------------------- Fri Nov 22 14:04:21 UTC 2019 - Matej Cepl diff --git a/shared-python-startup.spec b/shared-python-startup.spec index 5cc2efe..7b588cc 100644 --- a/shared-python-startup.spec +++ b/shared-python-startup.spec @@ -25,12 +25,6 @@ Source0: pythonstart Source1: LICENSE BuildRequires: filesystem Supplements: python(abi) -Conflicts: python3 < 3.8 -%if 0%{?suse_version} > 1200 -Conflicts: (python2 without python2_split_startup) -%else -Conflicts: python2 < 2.7.17 -%endif BuildArch: noarch %description From e55fe9f2ffb2a5c700fb9af64665be131b75106e1d98707371a8fa959c8d0c56 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 13 Dec 2019 13:45:30 +0000 Subject: [PATCH 2/2] Accepting request 756818 from openSUSE:Factory Resubmit - had to revert, as the new package is uninstallable on current TW; conflicts python3 < 3.8 - will take a while OBS-URL: https://build.opensuse.org/request/show/756818 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/shared-python-startup?expand=0&rev=6 --- shared-python-startup.changes | 6 ++++++ shared-python-startup.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/shared-python-startup.changes b/shared-python-startup.changes index b82bb16..7ee2521 100644 --- a/shared-python-startup.changes +++ b/shared-python-startup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 4 18:17:30 CET 2019 - Matej Cepl + +- Setup Conflicts: so that older version of Python don’t collide + with this package. + ------------------------------------------------------------------- Fri Nov 22 14:04:21 UTC 2019 - Matej Cepl diff --git a/shared-python-startup.spec b/shared-python-startup.spec index 7b588cc..5cc2efe 100644 --- a/shared-python-startup.spec +++ b/shared-python-startup.spec @@ -25,6 +25,12 @@ Source0: pythonstart Source1: LICENSE BuildRequires: filesystem Supplements: python(abi) +Conflicts: python3 < 3.8 +%if 0%{?suse_version} > 1200 +Conflicts: (python2 without python2_split_startup) +%else +Conflicts: python2 < 2.7.17 +%endif BuildArch: noarch %description