From 59c5838bb31cf0ec145d08b46a6bbfb8176473f840d395b104bbb5b8bf954450 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 14 Jan 2022 18:07:58 +0000 Subject: [PATCH] Accepting request 946491 from home:bnavigator:branches:devel:languages:python - Specfile fix: * Remove the Python 3.4 conditional. It the _nodots macro is not known to the obs resolver. * Also remove python2 lines for cleanup, not resolvable in 15.3 in either case. OBS-URL: https://build.opensuse.org/request/show/946491 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ncclient?expand=0&rev=5 --- python-ncclient.changes | 9 +++++++++ python-ncclient.spec | 16 ++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/python-ncclient.changes b/python-ncclient.changes index 589247d..3c5c119 100644 --- a/python-ncclient.changes +++ b/python-ncclient.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 14 17:35:29 UTC 2022 - Ben Greiner + +- Specfile fix: + * Remove the Python 3.4 conditional. It the _nodots macro is not + known to the obs resolver. + * Also remove python2 lines for cleanup, not resolvable in 15.3 + in either case. + ------------------------------------------------------------------- Tue Jan 11 20:42:01 UTC 2022 - Ben Greiner diff --git a/python-ncclient.spec b/python-ncclient.spec index 2a07c74..c7dac52 100644 --- a/python-ncclient.spec +++ b/python-ncclient.spec @@ -16,8 +16,8 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 +%{?!python_module:%define python_module() python3-%{**}} +%define skip_python2 1 Name: python-ncclient Version: 0.6.12 Release: 0 @@ -34,9 +34,6 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-lxml >= 3.3.0 Requires: python-paramiko >= 1.15.0 -%if 0%{?python_version_nodots} <= 34 -Requires: python-selectors2 >= 2.0.1 -%endif Requires: python-setuptools > 0.6 Requires: python-six BuildArch: noarch @@ -44,12 +41,6 @@ BuildRequires: %{python_module lxml >= 3.3.0} BuildRequires: %{python_module mock} BuildRequires: %{python_module paramiko >= 1.15.0} BuildRequires: %{python_module pytest} -%if %{with python2} -BuildRequires: python2-selectors2 >= 2.0.1 -%endif -%if 0%{?python3_version_nodots} <= 34 -BuildRequires: python3-selectors2 >= 2.0.1 -%endif BuildRequires: %{python_module six} %python_subpackages @@ -92,7 +83,8 @@ cd docs && make %{?_smp_mflags} html && rm build/html/.buildinfo %files %{python_files} %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/ncclient +%{python_sitelib}/ncclient-%{version}*-info %files -n python-ncclient-doc %doc README.md README.rst examples docs/build/html