- Remove python_module macro definition

- Add python-py dep for testing
- Use autosetup insteado of setup + patch
- More specific python_sitelib in %files

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-py?expand=0&rev=28
This commit is contained in:
Daniel Garcia 2022-11-29 17:05:45 +00:00 committed by Git OBS Bridge
parent aa307d3dc5
commit ccc4b63b0c
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 29 17:04:41 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
- Remove python_module macro definition
- Add python-py dep for testing
- Use autosetup insteado of setup + patch
- More specific python_sitelib in %files
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 15 08:13:43 UTC 2022 - Stephan Kulow <coolo@suse.com> Tue Mar 15 08:13:43 UTC 2022 - Stephan Kulow <coolo@suse.com>

View File

@ -17,7 +17,6 @@
%define oldpython python %define oldpython python
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test" %if "%{flavor}" == "test"
%define psuffix -test %define psuffix -test
@ -47,6 +46,7 @@ BuildRequires: python-rpm-macros
Obsoletes: %{oldpython}-py-docs Obsoletes: %{oldpython}-py-docs
BuildArch: noarch BuildArch: noarch
%if %{with test} %if %{with test}
BuildRequires: %{python_module py = %{version}}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
%endif %endif
%python_subpackages %python_subpackages
@ -62,8 +62,7 @@ the following tools and modules:
* py.path: uniform local and svn path objects * py.path: uniform local and svn path objects
%prep %prep
%setup -q -n py-%{version} %autosetup -p1 -n py-%{version}
%patch0 -p1
rm -rf py.egg-info rm -rf py.egg-info
rm -f tox.ini rm -f tox.ini
@ -92,7 +91,8 @@ export LANG=en_US.UTF-8
%files %{python_files} %files %{python_files}
%doc README.rst %doc README.rst
%license LICENSE %license LICENSE
%{python_sitelib}/* %{python_sitelib}/py
%{python_sitelib}/py-%{version}*-info
%endif %endif
%changelog %changelog