[qpid-cpp/f16] BZ747351 - python-qpid-qmf has namespace collision

Nuno Santos nsantos at fedoraproject.org
Thu Oct 20 19:15:05 UTC 2011


commit 40ccee94959a1833044c29e02d3628d9bbec7538
Author: Nuno Santos <nsantos at redhat.com>
Date:   Thu Oct 20 15:14:59 2011 -0400

    BZ747351 - python-qpid-qmf has namespace collision

 qpid-cpp.spec  |    6 ++----
 setup_py.patch |   34 ----------------------------------
 2 files changed, 2 insertions(+), 38 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 5a78b8a..6e8feea 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -107,7 +107,6 @@ Source1:        store-%{qpid_release}.%{store_svnrev}.tar.gz
 %if %{fedora}
 Patch0:         configure.patch
 Patch1:         fedora.patch
-Patch2:         setup_py.patch
 %endif
 
 %if %{rhel_4}
@@ -845,7 +844,6 @@ popd
 %if %{fedora}
 %patch0 -p0
 %patch1 -p2
-%patch2 -p0
 %endif
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -917,8 +915,8 @@ popd
 rm -rf %{buildroot}
 mkdir -p -m0755 %{buildroot}/%_bindir
 
-(cd python; %{__python} setup.py install --skip-build --root %{buildroot})
-(cd extras/qmf; %{__python} setup.py install --skip-build --root %{buildroot})
+(cd python; %{__python} setup.py install --skip-build --install-purelib %{python_sitearch} --root %{buildroot})
+(cd extras/qmf; %{__python} setup.py install --skip-build --install-purelib %{python_sitearch} --root %{buildroot})
 
 pushd %{_builddir}/qpid-%{version}/cpp
 make install DESTDIR=%{buildroot}


More information about the scm-commits mailing list