[python-quantumclient/el6] adjust overlapping files to support EPEL

Pádraig Brady pbrady at fedoraproject.org
Tue Apr 17 22:47:32 UTC 2012


commit 1c465f60055918f1b0f78a59ceda1b3594137547
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Apr 13 19:20:59 2012 +0100

    adjust overlapping files to support EPEL
    
    quantum/__init__.py is shared between this
    client and the main quantum package.
    For EPEL we need to adjust the main one,
    so give precehence to that one.

 python-quantumclient.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/python-quantumclient.spec b/python-quantumclient.spec
index 1db739d..7027471 100644
--- a/python-quantumclient.spec
+++ b/python-quantumclient.spec
@@ -4,7 +4,7 @@
 
 Name:       python-quantumclient
 Version:    2012.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Python API and CLI for OpenStack Quantum
 
 Group:      Development/Languages
@@ -46,10 +46,15 @@ rm -rf %{buildroot}%{python_sitelib}/quantum/client/tests
 %doc README
 %{_bindir}/quantum
 %{python_sitelib}/quantum
+# Give precedence to the same file from openstack-quantum
+%exclude %{python_sitelib}/quantum/__init__.*
 %{python_sitelib}/*.egg-info
 
 
 %changelog
+* Fri Apr 13 2012 Pádraig Brady <pbrady at redhat.com> - 2012.1-2
+- adjust to support EPEL
+
 * Mon Apr  9 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-1
 - Update to essex final release
 


More information about the scm-commits mailing list