From f4a754d4d8249623abefa6a79e1c002fda340fc4 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Mar 18 2014 21:08:31 +0000 Subject: import dbus-python-1.1.1-9.el7.src.rpm --- diff --git a/SOURCES/0001-Move-python-modules-to-architecture-specific-directo.patch b/SOURCES/0001-Move-python-modules-to-architecture-specific-directo.patch new file mode 100644 index 0000000..21c84d1 --- /dev/null +++ b/SOURCES/0001-Move-python-modules-to-architecture-specific-directo.patch @@ -0,0 +1,53 @@ +From 4953f89845a55bddd21df1b505301b884ab2809a Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Tue, 18 Mar 2014 16:04:23 -0400 +Subject: [PATCH] Move python modules to architecture-specific directory + +This is because dbus-python gets dragged in as a dependency of other +things people want to be multilib-compatible. As is the Python +modules conflict. +--- + Makefile.am | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ebc2e43..1a14da4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,7 +17,8 @@ EXTRA_DIST = \ + + # === dbus package === + +-nobase_python_PYTHON = \ ++dbuspydir = $(pyexecdir) ++nobase_dbuspy_DATA = \ + dbus/bus.py \ + dbus/connection.py \ + dbus/_compat.py \ +@@ -38,12 +39,12 @@ nobase_python_PYTHON = \ + dbus/types.py + + if !HAVE_PYTHON_3 +-nobase_python_PYTHON += \ ++nobase_dbuspy_DATA += \ + dbus/gobject_service.py \ + $(NULL) + endif + +-check_py_sources = $(nobase_python_PYTHON) ++check_py_sources = $(nobase_dbuspy_DATA) + include $(top_srcdir)/tools/check-coding-style.mk + + # === Devel stuff === +@@ -130,7 +131,7 @@ _dbus_glib_bindings/_dbus_glib_bindings.la: + + APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs + +-api api/index.html: $(nobase_python_PYTHON) \ ++api api/index.html: $(nobase_dbuspy_DATA) \ + _dbus_bindings/_dbus_bindings.la \ + _dbus_glib_bindings/_dbus_glib_bindings.la + rm -rf api +-- +1.8.3.1 + diff --git a/SPECS/dbus-python.spec b/SPECS/dbus-python.spec index d430c57..0f249fc 100644 --- a/SPECS/dbus-python.spec +++ b/SPECS/dbus-python.spec @@ -6,7 +6,7 @@ Summary: D-Bus Python Bindings Name: dbus-python Version: 1.1.1 -Release: 5%{?dist} +Release: 9%{?dist} License: MIT URL: http://www.freedesktop.org/software/dbus-python @@ -15,6 +15,7 @@ Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar Patch0: dbus-python-aarch64.patch # http://cgit.freedesktop.org/dbus/dbus-python/commit/?id=423ee853dfbb4ee9ed89a21e1cf2b6a928e2fc4d Patch1: dbus-python-pygobject38.patch +Patch2: 0001-Move-python-modules-to-architecture-specific-directo.patch BuildRequires: dbus-devel BuildRequires: dbus-glib-devel @@ -26,6 +27,8 @@ BuildRequires: python3-devel # for %%check BuildRequires: dbus-x11 pygobject3 +BuildRequires: autoconf automake libtool + Provides: python-dbus = %{version}-%{release} Provides: python-dbus%{?_isa} = %{version}-%{release} @@ -50,6 +53,9 @@ Summary: D-Bus bindings for python3 %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +autoreconf -vfi %build %global _configure ../configure @@ -82,16 +88,15 @@ rm -rfv $RPM_BUILD_ROOT%{_datadir}/doc/dbus-python/ %check # FIXME: seeing failures on f19+, http://bugzilla.redhat.com/913936 -make check -k -C python2-build ||: +#make check -k -C python2-build %if 0%{?python3} -make check -k -C python3-build ||: +#make check -k -C python3-build %endif - %files %doc COPYING ChangeLog README NEWS %{python_sitearch}/*.so -%{python_sitelib}/dbus/ +%{python_sitearch}/dbus/ %files devel %doc doc/API_CHANGES.txt doc/HACKING.txt doc/tutorial.txt @@ -101,11 +106,24 @@ make check -k -C python3-build ||: %if 0%{?python3} %files -n python3-dbus %{python3_sitearch}/*.so -%{python3_sitelib}/dbus/ +%{python3_sitearch}/dbus/ %endif %changelog +* Tue Mar 18 2014 Colin Walters - 1.1.1-9 +- Move modules to libdir to avoid multilib conflicts +- And comment out test suite, since we were not actually + failing if it failed, but it trips up an rpmdiff check + on the output of the suite. +- Resolves: #1076411 + +* Fri Jan 24 2014 Daniel Mach - 1.1.1-7 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.1.1-6 +- Mass rebuild 2013-12-27 + * Thu Apr 25 2013 Peter Robinson 1.1.1-5 - Add upstream patch to fix pygobject 3.8