Subpackage python2-systemd has been removed

This commit is contained in:
Miro Hrončok 2019-09-08 23:42:52 +02:00
parent 3320eaec1a
commit efff937505

View File

@ -1,6 +1,6 @@
Name: python-systemd Name: python-systemd
Version: 234 Version: 234
Release: 10%{?dist} Release: 11%{?dist}
Summary: Python module wrapping systemd functionality Summary: Python module wrapping systemd functionality
License: LGPLv2+ License: LGPLv2+
@ -9,11 +9,9 @@ Source0: https://github.com/systemd/python-systemd/archive/v%{version}.ta
BuildRequires: gcc BuildRequires: gcc
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: python2-devel
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
BuildRequires: web-assets-devel BuildRequires: web-assets-devel
BuildRequires: python2-pytest
BuildRequires: python3-pytest BuildRequires: python3-pytest
%global _description \ %global _description \
@ -25,17 +23,6 @@ provided by libsystemd is also wrapped.
%description %_description %description %_description
%package -n python2-systemd
Summary: %{summary}
%{?python_provide:%python_provide python2-systemd}
Provides: systemd-python = %{version}-%{release}
Provides: systemd-python%{?_isa} = %{version}-%{release}
Obsoletes: systemd-python < 230
Recommends: %{name}-doc
%description -n python2-systemd %_description
%package -n python3-systemd %package -n python3-systemd
Summary: %{summary} Summary: %{summary}
@ -59,13 +46,11 @@ Requires: js-jquery
sed -i 's/py\.test/pytest/' Makefile sed -i 's/py\.test/pytest/' Makefile
%build %build
make PYTHON=%{__python2} build
make PYTHON=%{__python3} build make PYTHON=%{__python3} build
make PYTHON=%{__python3} SPHINX_BUILD=sphinx-build-3 sphinx-html make PYTHON=%{__python3} SPHINX_BUILD=sphinx-build-3 sphinx-html
rm -r build/html/.buildinfo build/html/.doctrees rm -r build/html/.buildinfo build/html/.doctrees
%install %install
%make_install PYTHON=%{__python2}
%make_install PYTHON=%{__python3} %make_install PYTHON=%{__python3}
mkdir -p %{buildroot}%{_pkgdocdir} mkdir -p %{buildroot}%{_pkgdocdir}
cp -rv build/html %{buildroot}%{_pkgdocdir}/ cp -rv build/html %{buildroot}%{_pkgdocdir}/
@ -76,16 +61,8 @@ cp -p README.md NEWS %{buildroot}%{_pkgdocdir}/
# if the socket is not there, skip doc tests # if the socket is not there, skip doc tests
test -f /run/systemd/journal/stdout || \ test -f /run/systemd/journal/stdout || \
sed -i 's/--doctest[^ ]*//g' pytest.ini sed -i 's/--doctest[^ ]*//g' pytest.ini
make PYTHON=%{__python2} check
make PYTHON=%{__python3} check make PYTHON=%{__python3} check
%files -n python2-systemd
%license LICENSE.txt
%doc %{_pkgdocdir}
%exclude %{_pkgdocdir}/html
%{python2_sitearch}/systemd/
%{python2_sitearch}/systemd_python*.egg-info
%files -n python3-systemd %files -n python3-systemd
%license LICENSE.txt %license LICENSE.txt
%doc %{_pkgdocdir} %doc %{_pkgdocdir}
@ -97,6 +74,10 @@ make PYTHON=%{__python3} check
%doc %{_pkgdocdir}/html %doc %{_pkgdocdir}/html
%changelog %changelog
* Sun Sep 08 2019 Miro Hrončok <mhroncok@redhat.com> - 234-11
- Subpackage python2-systemd has been removed
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 234-10 * Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 234-10
- Rebuilt for Python 3.8 - Rebuilt for Python 3.8