diff --git a/dbus-python.spec b/dbus-python.spec index 63628dd..e0e43bd 100644 --- a/dbus-python.spec +++ b/dbus-python.spec @@ -1,7 +1,10 @@ +%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: 4%{?dist} +Release: 5%{?dist} License: MIT URL: http://www.freedesktop.org/wiki/Software/DBusBindings/ @@ -30,6 +33,8 @@ D-Bus python bindings for use with python programs. 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} @@ -41,6 +46,8 @@ Obsoletes: dbus-python < %{version}-%{release} Summary: D-Bus bindings for python3 %{?python_provide:%python_provide python3-dbus} BuildRequires: python3-devel +# for py3_build +BuildRequires: python3dist(setuptools) %description -n python3-dbus %{summary}. @@ -55,24 +62,44 @@ bindings. %prep %autosetup -p1 -%build # For new arches (aarch64/ppc64le), and patch0 autoreconf -vif -%global _configure ../configure -mkdir python2-build; pushd python2-build +# 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 -mkdir python3-build; pushd python3-build +pushd python3-build +%py3_build %configure PYTHON="%{__python3}" %make_build popd %install -%make_install -C python2-build -%make_install -C python3-build +# 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 @@ -88,12 +115,14 @@ make check -k -C python3-build || (cat python3-build/test-suite.log && false) %license COPYING %{python2_sitearch}/*.so %{python2_sitearch}/dbus/ +%{python2_sitearch}/dbus_python*egg-info %files -n python3-dbus %doc NEWS %license COPYING %{python3_sitearch}/*.so %{python3_sitearch}/dbus/ +%{python3_sitearch}/dbus_python*egg-info %files devel %doc README ChangeLog doc/API_CHANGES.txt doc/HACKING.txt doc/tutorial.txt @@ -101,6 +130,9 @@ make check -k -C python3-build || (cat python3-build/test-suite.log && false) %{_libdir}/pkgconfig/dbus-python.pc %changelog +* Mon Feb 11 2019 Neal Gompa - 1.2.8-5 +- Run setuptools build to generate pythonXdist() metadata (#1663693) + * Thu Jan 31 2019 Fedora Release Engineering - 1.2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild