[hg-git/el6: 1/2] Previous fix was too aggressive ... we need python-ordereddict only on EPEL-6. Thanks to Matěj Cepl

Christopher Meng cicku at fedoraproject.org
Tue Dec 3 09:01:46 UTC 2013


commit bc3e409ab581335b3ef14c06f4583c9ecf1d7409
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Dec 3 16:58:21 2013 +0800

    Previous fix was too aggressive ... we need python-ordereddict only on
    EPEL-6. Thanks to Matěj Cepl.

 hg-git.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/hg-git.spec b/hg-git.spec
index 4753b96..24521d8 100644
--- a/hg-git.spec
+++ b/hg-git.spec
@@ -2,7 +2,7 @@
 
 Name:           hg-git
 Version:        0.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mercurial Plugin for Communicating with Git Servers
 License:        GPLv2+
 URL:            http://hg-git.github.io
@@ -14,7 +14,9 @@ BuildRequires:  python-dulwich
 BuildRequires:  python-setuptools
 Requires:       mercurial
 Requires:       python-dulwich
+%if 0%{?rhel} < 7
 Requires:       python-ordereddict
+%endif
 
 %description
 This is the Hg-Git plugin for Mercurial, adding the ability to push and pull
@@ -40,6 +42,9 @@ identical - Mercurial data does not get lost in translation.
 %{python2_sitelib}/*.egg-info/
 
 %changelog
+* Mon Dec 02 2013 Matěj Cepl <mcepl at redhat.com> - 0.4.0-4
+- We only need python-ordereddict on EPEL<=6.
+
 * Fri Nov 08 2013 Christopher Meng <rpm at cicku.me> - 0.4.0-3
 - Add missing ordereddict requires.
 


More information about the scm-commits mailing list