Revert "Add platform-python subpackage"
This project didn't fly.
This reverts commit 9c8bd408df
.
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
e4eb0d4129
commit
87190ee777
@ -2,10 +2,8 @@
|
|||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
%bcond_without python3
|
%bcond_without python3
|
||||||
%bcond_without platform_python
|
|
||||||
%else
|
%else
|
||||||
%bcond_with python3
|
%bcond_with python3
|
||||||
%bcond_with platform_python
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global upstream_name nose
|
%global upstream_name nose
|
||||||
@ -32,7 +30,7 @@ output capture and more.\
|
|||||||
|
|
||||||
Name: python-nose
|
Name: python-nose
|
||||||
Version: 1.3.7
|
Version: 1.3.7
|
||||||
Release: 16%{?dist}
|
Release: 17%{?dist}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
License: LGPLv2+ and Public Domain
|
License: LGPLv2+ and Public Domain
|
||||||
@ -62,11 +60,6 @@ BuildRequires: python3-devel
|
|||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
BuildRequires: python3-coverage >= 3.4-1
|
BuildRequires: python3-coverage >= 3.4-1
|
||||||
%endif
|
%endif
|
||||||
%if %{with platform_python}
|
|
||||||
BuildRequires: platform-python-devel
|
|
||||||
BuildRequires: platform-python-setuptools
|
|
||||||
BuildRequires: platform-python-coverage >= 3.4-1
|
|
||||||
%endif
|
|
||||||
BuildRequires: python-setuptools
|
BuildRequires: python-setuptools
|
||||||
BuildRequires: dos2unix
|
BuildRequires: dos2unix
|
||||||
BuildRequires: python-coverage >= 3.4-1
|
BuildRequires: python-coverage >= 3.4-1
|
||||||
@ -106,7 +99,7 @@ Summary: Discovery-based unit test extension for Python3
|
|||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: python3-setuptools
|
Requires: python3-setuptools
|
||||||
%{?python_provide:%python_provide python3-%{upstream_name}}
|
%{?python_provide:%python_provide python3-%{upstream_name}}
|
||||||
|
Obsoletes: platform-python-%{upstream_name} < 1.3.7-17
|
||||||
|
|
||||||
%description -n python3-%{upstream_name}
|
%description -n python3-%{upstream_name}
|
||||||
%{desc}
|
%{desc}
|
||||||
@ -115,20 +108,6 @@ This package installs the nose module and nosetests3 program that can discover
|
|||||||
python3 unit tests.
|
python3 unit tests.
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
|
|
||||||
%if %{with platform_python}
|
|
||||||
%package -n platform-python-%{upstream_name}
|
|
||||||
Summary: Discovery-based unit test extension for Platform Python
|
|
||||||
Group: Development/Languages
|
|
||||||
|
|
||||||
|
|
||||||
%description -n platform-python-%{upstream_name}
|
|
||||||
%{desc}
|
|
||||||
|
|
||||||
This package installs the nose module that can discover
|
|
||||||
platform-python unit tests.
|
|
||||||
%endif # with_platform_python
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{upstream_name}-%{version}
|
%setup -q -n %{upstream_name}-%{version}
|
||||||
%patch0 -p1 -b .coverage4
|
%patch0 -p1 -b .coverage4
|
||||||
@ -144,11 +123,6 @@ rm -rf %{py3dir}
|
|||||||
cp -a . %{py3dir}
|
cp -a . %{py3dir}
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
%if %{with platform_python}
|
|
||||||
rm -rf %{platform_py_dir}
|
|
||||||
cp -a . %{platform_py_dir}
|
|
||||||
%endif # with_python3
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py2_build
|
%py2_build
|
||||||
|
|
||||||
@ -158,22 +132,10 @@ pushd %{py3dir}
|
|||||||
popd
|
popd
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
%if %{with platform_python}
|
|
||||||
pushd %{platform_py_dir}
|
|
||||||
%platform_py_build
|
|
||||||
popd
|
|
||||||
%endif # with_platform_python
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# Must do the python3 install first because the scripts in /usr/bin are
|
# Must do the python3 install first because the scripts in /usr/bin are
|
||||||
# overwritten with every setup.py install (and we want the python2 version
|
# overwritten with every setup.py install (and we want the python2 version
|
||||||
# to be the default for now).
|
# to be the default for now).
|
||||||
%if %{with platform_python}
|
|
||||||
pushd %{platform_py_dir}
|
|
||||||
%platform_py_install
|
|
||||||
rm %{buildroot}%{_bindir}/*
|
|
||||||
popd
|
|
||||||
%endif # with_python3
|
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
pushd %{py3dir}
|
pushd %{py3dir}
|
||||||
@ -219,14 +181,6 @@ export PYTHONPATH=`pwd`/build/lib
|
|||||||
popd
|
popd
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
%if %{with platform_python}
|
|
||||||
pushd %{platform_py_dir}
|
|
||||||
export PYTHONPATH=`pwd`/build/lib
|
|
||||||
%{__platform_python} setup.py build_tests
|
|
||||||
%{__platform_python} selftest.py
|
|
||||||
popd
|
|
||||||
%endif # with_python3
|
|
||||||
|
|
||||||
|
|
||||||
%files -n python2-%{upstream_name}
|
%files -n python2-%{upstream_name}
|
||||||
%license lgpl.txt
|
%license lgpl.txt
|
||||||
@ -248,12 +202,6 @@ popd
|
|||||||
%{python3_sitelib}/nose*
|
%{python3_sitelib}/nose*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with platform_python}
|
|
||||||
%files -n platform-python-%{upstream_name}
|
|
||||||
%license lgpl.txt
|
|
||||||
%{platform_python_sitelib}/nose*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files docs
|
%files docs
|
||||||
%license lgpl.txt
|
%license lgpl.txt
|
||||||
%doc AUTHORS CHANGELOG examples NEWS README.txt reST
|
%doc AUTHORS CHANGELOG examples NEWS README.txt reST
|
||||||
@ -262,6 +210,9 @@ popd
|
|||||||
%endif # with_docs
|
%endif # with_docs
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Nov 04 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.7-17
|
||||||
|
- Remove platform-python subpackage
|
||||||
|
|
||||||
* Fri Sep 29 2017 Troy Dawson <tdawson@redhat.com> - 1.3.7-16
|
* Fri Sep 29 2017 Troy Dawson <tdawson@redhat.com> - 1.3.7-16
|
||||||
- Cleanup spec file conditionals
|
- Cleanup spec file conditionals
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user