Remove the Python 2 subpackage for pykickstart (#1686380)

This commit is contained in:
David Cantrell 2019-03-07 15:33:10 -05:00
parent 997cdff496
commit a41ffb1f1e

View File

@ -1,9 +1,3 @@
%if 0%{?rhel} > 7
%bcond_with python2
%else
%bcond_without python2
%endif
# Disable tests by default because they fail to run inside mock builds # Disable tests by default because they fail to run inside mock builds
# at the moment, but can run locally. To build and run tests, do: # at the moment, but can run locally. To build and run tests, do:
# rpmbuild -ba --with runtests pykickstart.spec # rpmbuild -ba --with runtests pykickstart.spec
@ -11,7 +5,7 @@
Name: pykickstart Name: pykickstart
Version: 3.20 Version: 3.20
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 and MIT License: GPLv2 and MIT
Summary: Python utilities for manipulating kickstart files. Summary: Python utilities for manipulating kickstart files.
Url: http://fedoraproject.org/wiki/pykickstart Url: http://fedoraproject.org/wiki/pykickstart
@ -24,15 +18,6 @@ Source1: %{name}-%{version}.tar.gz.asc
BuildArch: noarch BuildArch: noarch
BuildRequires: gettext BuildRequires: gettext
%if %{with python2}
BuildRequires: python2-coverage
BuildRequires: python2-devel
BuildRequires: python2-nose
BuildRequires: python2-ordered-set
BuildRequires: python2-setuptools
BuildRequires: python2-requests
%endif
BuildRequires: python3-coverage BuildRequires: python3-coverage
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-nose BuildRequires: python3-nose
@ -45,26 +30,8 @@ BuildRequires: python3-sphinx
Requires: python3-kickstart = %{version}-%{release} Requires: python3-kickstart = %{version}-%{release}
%description %description
Python utilities for manipulating kickstart files. The Python 2 and 3 Python utilities for manipulating kickstart files.
libraries can be found in the packages python-kickstart and python3-kickstart
respectively.
%if %{with python2}
# Python 2 library
%package -n python2-kickstart
%{?python_provide:%python_provide python2-kickstart}
%{?python_provide:%python_provide python2-pykickstart}
Summary: Python 2 library for manipulating kickstart files.
Requires: python2-six
Requires: python2-requests
Requires: python2-ordered-set
%description -n python2-kickstart
Python 2 library for manipulating kickstart files. The binaries are found in
the pykickstart package.
%endif
# Python 3 library
%package -n python3-kickstart %package -n python3-kickstart
Summary: Python 3 library for manipulating kickstart files. Summary: Python 3 library for manipulating kickstart files.
Requires: python3-six Requires: python3-six
@ -78,36 +45,16 @@ the pykickstart package.
%prep %prep
%setup -q %setup -q
%if %{with python2}
rm -rf %{py3dir}
mkdir %{py3dir}
cp -a . %{py3dir}
%endif
%build %build
%if %{with python2}
make PYTHON=%{__python2}
make -C %{py3dir} PYTHON=%{__python3}
%else
make PYTHON=%{__python3} make PYTHON=%{__python3}
%endif
%install %install
%if %{with python2}
make PYTHON=%{__python2} DESTDIR=%{buildroot} install
make -C %{py3dir} PYTHON=%{__python3} DESTDIR=%{buildroot} install
%else
make PYTHON=%{__python3} DESTDIR=%{buildroot} install make PYTHON=%{__python3} DESTDIR=%{buildroot} install
%endif
%check %check
%if %{with runtests} %if %{with runtests}
%if %{with python2}
make -C %{py3dir} PYTHON=%{__python3} test
%else
make PYTHON=%{__python3} test make PYTHON=%{__python3} test
%endif %endif
%endif
%files %files
%license COPYING %license COPYING
@ -122,15 +69,6 @@ make PYTHON=%{__python3} test
%{_mandir}/man1/ksvalidator.1.gz %{_mandir}/man1/ksvalidator.1.gz
%{_mandir}/man1/ksverdiff.1.gz %{_mandir}/man1/ksverdiff.1.gz
%if %{with python2}
%files -n python2-kickstart
%doc docs/2to3
%doc docs/programmers-guide
%doc docs/kickstart-docs.txt
%{python2_sitelib}/pykickstart*.egg-info
%{python2_sitelib}/pykickstart
%endif
%files -n python3-kickstart %files -n python3-kickstart
%doc docs/2to3 %doc docs/2to3
%doc docs/programmers-guide %doc docs/programmers-guide
@ -139,6 +77,9 @@ make PYTHON=%{__python3} test
%{python3_sitelib}/pykickstart*.egg-info %{python3_sitelib}/pykickstart*.egg-info
%changelog %changelog
* Thu 07-Mar-2019 David Cantrell <dcantrell@redhat.com> - 3.20-3
- Remove the Python 2 subpackage for pykickstart (#1686380)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.20-2 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild