diff --git a/python-pyPEG2.changes b/python-pyPEG2.changes index b83dd6b..a4db967 100644 --- a/python-pyPEG2.changes +++ b/python-pyPEG2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 2 21:42:12 UTC 2017 - sor.alexei@meowr.ru + +- Update for the multipython build. +- Use python-nose unconditionally. + ------------------------------------------------------------------- Thu Apr 21 07:07:37 UTC 2016 - sor.alexei@meowr.ru diff --git a/python-pyPEG2.spec b/python-pyPEG2.spec index 91ed797..21d61b1 100644 --- a/python-pyPEG2.spec +++ b/python-pyPEG2.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyPEG2 # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,27 +13,29 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python %define _name pyPEG2 Name: python-pyPEG2 Version: 2.15.2 Release: 0 -License: GPL-2.0 Summary: PEG Parser-Interpreter framework for Python -Url: https://fdik.org/pyPEG2 +License: GPL-2.0 Group: Development/Languages/Python -Source: https://pypi.python.org/packages/source/p/%{_name}/%{_name}-%{version}.tar.gz -BuildRequires: python -BuildRequires: python-lxml +Url: https://fdik.org/pyPEG2 +Source: https://files.pythonhosted.org/packages/source/p/%{_name}/%{_name}-%{version}.tar.gz +BuildRequires: %{python_module lxml} +BuildRequires: %{python_module nose} +BuildRequires: python-rpm-macros Requires: python-lxml -%if 0%{?suse_version} > 1120 && !(0%{?suse_version} == 1315 && 0%{?is_opensuse}) -BuildRequires: python-nose -%endif -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%else -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%ifpython2 +# python-pyPEG2 was last used in openSUSE Leap 14.2. +Provides: %{oldpython}-pyPEG2 = %{version} +Obsoletes: %{oldpython}-pyPEG2 < %{version} %endif %description @@ -41,25 +43,24 @@ pyPEG is a plain and simple intrinsic parser interpreter framework for Python. It is based on Parsing Expression Grammar, PEG. With pyPEG you can parse many formal languages in a very easy way. +%python_subpackages + %prep %setup -q -n %{_name}-%{version} %build -python2 setup.py build +%python_build %install -python2 setup.py install \ - --root=%{buildroot} --prefix=%{_prefix} +%python_install -%if 0%{?suse_version} > 1120 && !(0%{?suse_version} == 1315 && 0%{?is_opensuse}) %check -nosetests-%{py_ver} -%endif +nosetests-%{python_version} -%files +%files %{python_files} %defattr(-,root,root) %doc CHANGES.txt LICENSE.txt README.txt %{python_sitelib}/pypeg2/ -%{python_sitelib}/%{_name}-* +%{python_sitelib}/%{_name}-%{version}-py%{python_version}.egg-info %changelog