diff --git a/dbus-python.spec b/dbus-python.spec index f483a70..9cf5e04 100644 --- a/dbus-python.spec +++ b/dbus-python.spec @@ -1,10 +1,7 @@ -%global python2dir %{_builddir}/python2-%{name}-%{version}-%{release} -%global python3dir %{_builddir}/python3-%{name}-%{version}-%{release} - Summary: D-Bus Python Bindings Name: dbus-python Version: 1.2.8 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT URL: http://www.freedesktop.org/wiki/Software/DBusBindings/ @@ -19,10 +16,8 @@ Patch2: 0002-Remove-.tp_print-access-from-Python-3.patch BuildRequires: dbus-devel BuildRequires: dbus-glib-devel -BuildRequires: python2-docutils # for %%check BuildRequires: dbus-x11 -BuildRequires: python2-gobject BuildRequires: python3-gobject # autoreconf and friends BuildRequires: autoconf-archive automake libtool @@ -32,19 +27,6 @@ D-Bus python bindings for use with python programs. %description %_description -%package -n python2-dbus -Summary: %summary -%{?python_provide:%python_provide python2-dbus} -BuildRequires: python2-devel -# for py2_build -BuildRequires: python2dist(setuptools) -# Remove before F30 -Provides: dbus-python = %{version}-%{release} -Provides: dbus-python%{?_isa} = %{version}-%{release} -Obsoletes: dbus-python < %{version}-%{release} - -%description -n python2-dbus %_description - %package -n python3-dbus Summary: D-Bus bindings for python3 %{?python_provide:%python_provide python3-dbus} @@ -68,57 +50,22 @@ bindings. # For new arches (aarch64/ppc64le), and patch0 autoreconf -vif -# Copy the source trees into subdirs for setup.py stuff -mkdir -p %{python2dir} -cp -a . %{python2dir} -mkdir -p %{python3dir} -cp -a . %{python3dir} - -mv %{python2dir} python2-build -mv %{python3dir} python3-build - %build %set_build_flags -# Yes, this is gross, but this gets us all the stuff set up correctly... -pushd python2-build -%py2_build -%configure PYTHON="%{__python2}" -%make_build -popd - -pushd python3-build %py3_build %configure PYTHON="%{__python3}" %make_build -popd %install -# And the grossness continues... -pushd python2-build -%py2_install -%make_install -popd - -pushd python3-build %py3_install %make_install -popd # unpackaged files -rm -fv $RPM_BUILD_ROOT%{python2_sitearch}/*.la rm -fv $RPM_BUILD_ROOT%{python3_sitearch}/*.la rm -rfv $RPM_BUILD_ROOT%{_datadir}/doc/dbus-python/ %check -make check -k -C python2-build || (cat python2-build/test-suite.log && false) -make check -k -C python3-build || (cat python3-build/test-suite.log && false) - -%files -n python2-dbus -%doc NEWS -%license COPYING -%{python2_sitearch}/*.so -%{python2_sitearch}/dbus/ -%{python2_sitearch}/dbus_python*egg-info +make check -k || (cat test-suite.log && false) %files -n python3-dbus %doc NEWS @@ -133,6 +80,10 @@ make check -k -C python3-build || (cat python3-build/test-suite.log && false) %{_libdir}/pkgconfig/dbus-python.pc %changelog +* Thu Jan 16 2020 Miro Hrončok - 1.2.8-9 +- Subpackage python2-dbus has been removed + See https://fedoraproject.org/wiki/Changes/RetirePython2 + * Thu Oct 03 2019 Miro Hrončok - 1.2.8-8 - Rebuilt for Python 3.8.0rc1 (#1748018)