From 95bc8ec5c6a0cbcf34dc8bbeafb1ec5ab09be22c Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Aug 25 2015 12:26:26 +0000 Subject: fix python3 builds --- diff --git a/python-pluggy.spec b/python-pluggy.spec index 0d8f5c0..2bd06ba 100644 --- a/python-pluggy.spec +++ b/python-pluggy.spec @@ -13,7 +13,7 @@ Name: python-pluggy Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The plugin manager stripped of pytest specific details License: MIT @@ -25,7 +25,7 @@ BuildArch: noarch BuildRequires: python2-devel BuildRequires: pytest BuildRequires: python-setuptools -%if %{with python3} +%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-pytest BuildRequires: python3-setuptools @@ -75,12 +75,12 @@ popd %install %if 0%{?with_python3} pushd python3 -%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} popd %endif # with python3 pushd python2 -%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} popd @@ -97,27 +97,29 @@ popd %files -%{python_sitelib}/%{pypiname}.py -%{python_sitelib}/%{pypiname}.pyc -%{python_sitelib}/%{pypiname}.pyo -%{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info +%doc README.rst +%license LICENSE +%{python2_sitelib}/%{pypiname}.py +%{python2_sitelib}/%{pypiname}.pyc +%{python2_sitelib}/%{pypiname}.pyo +%{python2_sitelib}/%{pypiname}-%{version}-py%{python2_version}.egg-info + %if 0%{?with_python3} +%files -n python3-%{pypiname} %{python3_sitelib}/%{pypiname}.py %{python3_sitelib}/__pycache__/%{pypiname}.cpython-34.pyc %{python3_sitelib}/__pycache__/%{pypiname}.cpython-34.pyo -%{python3_sitelib}/%{pypiname}-%{version}-py3.4.egg-info/PKG-INFO -%{python3_sitelib}/%{pypiname}-%{version}-py3.4.egg-info/SOURCES.txt -%{python3_sitelib}/%{pypiname}-%{version}-py3.4.egg-info/dependency_links.txt -%{python3_sitelib}/%{pypiname}-%{version}-py3.4.egg-info/top_level.txt -%endif # with python3 - +%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info %doc README.rst %license LICENSE - +%endif # with python3 %changelog +* Tue Aug 25 2015 Matthias Runge - 0.3.0-3 +- fix python3 builds + * Fri Aug 21 2015 Matthias Runge - 0.3.0-2 - add python2_sitelib macros and BR to setuptools (rhbz#1254484)