From 1c02ca831619df490ba3b327351e0d7e6db9f8f75a92cd0ff8ecd81394f9064a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 12 Aug 2021 12:15:17 +0000 Subject: [PATCH] Accepting request 911582 from home:yfjiang:branches:devel:languages:python - Completely remove python2 build for TW, Leap 15.4 and SLE 15 SP4. - Add buildrequires xauth to successfully build on SLE. OBS-URL: https://build.opensuse.org/request/show/911582 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-xlib?expand=0&rev=18 --- python-python-xlib.changes | 10 ++++++++++ python-python-xlib.spec | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/python-python-xlib.changes b/python-python-xlib.changes index 1ea329d..73e4782 100644 --- a/python-python-xlib.changes +++ b/python-python-xlib.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 12 11:29:05 UTC 2021 - Yifan Jiang + +- Completely remove python2 build for TW, Leap 15.4 and SLE 15 SP4. + +------------------------------------------------------------------- +Thu Aug 12 11:26:42 UTC 2021 - Yifan Jiang + +- Add buildrequires xauth to successfully build on SLE. + ------------------------------------------------------------------- Fri Dec 11 23:39:19 UTC 2020 - Benjamin Greiner diff --git a/python-python-xlib.spec b/python-python-xlib.spec index 3c8339c..47e08ec 100644 --- a/python-python-xlib.spec +++ b/python-python-xlib.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-xlib # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,11 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%if !0%{?sle_version} || 0%{?sle_version} > 150300 +%define skip_python2 1 +%else %define oldpython python +%endif Name: python-python-xlib Version: 0.29 Release: 0 @@ -35,6 +39,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.10.0} %if 0%{suse_version} < 1550 BuildRequires: python-mock +BuildRequires: xauth %endif BuildRequires: dos2unix BuildRequires: fdupes @@ -43,7 +48,7 @@ Requires: python-six >= 1.10.0 BuildArch: noarch Provides: python-xlib = %{version} Obsoletes: python-xlib < %{version} -%ifpython2 +%if 0%{?sle_version} && 0%{?sle_version} <= 150300 && "%{python_flavor}" == "python2" Provides: %{oldpython}-xlib = %{version} Obsoletes: %{oldpython}-xlib < %{version} %endif