From b447ace799d37e04594309c5d67abd6a79d28fed3637e86bc521543494bb0b42 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Tue, 14 Mar 2017 13:23:11 +0000 Subject: [PATCH] Accepting request 479251 from devel:languages:python:singlespec - singlespec tweaks OBS-URL: https://build.opensuse.org/request/show/479251 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=52 --- python-pytz.changes | 5 +++++ python-pytz.spec | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/python-pytz.changes b/python-pytz.changes index 3db1599..7ccf395 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 13 19:31:04 UTC 2017 - jmatejek@suse.com + +- singlespec tweaks + ------------------------------------------------------------------- Mon Mar 13 18:08:26 UTC 2017 - astieger@suse.com diff --git a/python-pytz.spec b/python-pytz.spec index 3d0f100..da8c3ce 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -16,7 +16,8 @@ # -%{?!python_module:%define python_module() python-%1 python3-%1} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-pytz Version: 2016.10 Release: 0 @@ -39,14 +40,12 @@ BuildRequires: python-rpm-macros # Tests will use this package BuildRequires: timezone BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif -Provides: python-tz = 2014b -Obsoletes: python-tz < 2014b +%ifpython2 +Provides: %{oldpython}-tz = 2014b +Obsoletes: %{oldpython}-tz < 2014b +%endif %python_subpackages @@ -83,7 +82,7 @@ rm -fr %{buildroot}%{python_sitelib}/pytz/zoneinfo %{python_expand %fdupes %{buildroot}%{$python_sitelib}} %check -%{python_expand nosetests-%$python_bin_suffix} +%python_exec %{_bindir}/nosetests %files %{python_files} %defattr(-,root,root,-)