From 8d8683b3b04f1e2954da738f853b2b5ac6de8538 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Mar 17 2014 19:49:10 +0000
Subject: import PackageKit-0.8.9-11.el7.src.rpm


---

diff --git a/SOURCES/0001-Do-not-install-into-python_sitelib.patch b/SOURCES/0001-Do-not-install-into-python_sitelib.patch
new file mode 100644
index 0000000..ae7fa93
--- /dev/null
+++ b/SOURCES/0001-Do-not-install-into-python_sitelib.patch
@@ -0,0 +1,33 @@
+From fae22c2f1bf5d40b0ba5cb47f597daaf3ed4ae6b Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 17 Mar 2014 19:35:04 +0000
+Subject: [PATCH] Do not install into python_sitelib
+
+The .pyc and .pyo files are actually architecture specific and this causes
+PackageKit to fail the RHEL multilib self tests.
+---
+ configure.ac               | 11 +++++++++--
+ contrib/PackageKit.spec.in |  5 +++--
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 68ce26a..8cdabd7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,8 +91,14 @@ if test x$enable_python3 = xyes; then
+ else
+ 	AM_PATH_PYTHON([2.7])
+ fi
+-
+-PYTHON_PACKAGE_DIR=${pythondir}/packagekit
++AC_ARG_WITH([python_package_dir],
++	    AS_HELP_STRING([--with-python-package-dir=<location>],
++			   [Location for python modules]))
++if test -z "$with_python_package_dir" ; then
++	PYTHON_PACKAGE_DIR=${pythondir}/packagekit
++else
++	PYTHON_PACKAGE_DIR=${with_python_package_dir}/packagekit
++fi
+ AC_SUBST(PYTHON_PACKAGE_DIR)
+ 
+ if test "$GCC" = "yes"; then
diff --git a/SPECS/PackageKit.spec b/SPECS/PackageKit.spec
index 21d6cd9..36bc3d1 100644
--- a/SPECS/PackageKit.spec
+++ b/SPECS/PackageKit.spec
@@ -6,7 +6,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.8.9
-Release:   8%{?dist}
+Release:   11%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -21,6 +21,9 @@ Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 Patch4: PackageKit-0.7.4-xulrunner2.patch
 
 # Upstream already
+Patch5: 0001-Do-not-install-into-python_sitelib.patch
+
+# Upstream already
 Patch99: PackageKit-git-fixes.patch
 
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
@@ -243,6 +246,7 @@ user to restart the computer or remove and re-insert the device.
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 %patch4 -p1 -b .xulrunner2
+%patch5 -p1 -b .python_sitelib
 %patch99 -p1 -b .git
 
 NOCONFIGURE=1 ./autogen.sh
@@ -259,6 +263,7 @@ NOCONFIGURE=1 ./autogen.sh
         --enable-bash-completion \
 %endif
         --with-default-backend=auto \
+        --with-python-package-dir=%{python_sitearch} \
         --disable-local \
         --disable-strict \
         --disable-silent-rules \
@@ -316,11 +321,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %dir %{_sysconfdir}/PackageKit/events/pre-transaction.d
 %{_sysconfdir}/PackageKit/events/*.d/README
 %dir %{_localstatedir}/lib/PackageKit
-%dir %{python_sitelib}/packagekit
+%dir %{python_sitearch}/packagekit
 %dir %{_localstatedir}/cache/PackageKit
 %ghost %verify(not md5 size mtime) %{_localstatedir}/cache/PackageKit/groups.sqlite
 %dir %{_localstatedir}/cache/PackageKit/downloads
-%{python_sitelib}/packagekit/*py*
+%{python_sitearch}/packagekit/*py*
 %if !0%{?rhel}
 %{_datadir}/bash-completion/completions/pkcon
 %endif
@@ -446,6 +451,16 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
+* Mon Mar 17 2014 Richard Hughes <rhughes@redhat.com> - 0.8.9-11
+- Do not install into python_sitelib to fix multilib conflicts
+- Resolves: #1076424
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.8.9-10
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.8.9-9
+- Mass rebuild 2013-12-27
+
 * Tue Nov 12 2013 Richard Hughes <rhughes@redhat.com> - 0.8.9-8
 - Modify the /etc/PackageKit/Vendor.conf for RHEL
 - Resolves: #830819