Attachment 831700 Details for Bug 1036831 – suggested patch

[patch] suggested patch

0001-python-ordereddict-is-not-required-for-Fedoras-and-R.patch (text/plain), 1.48 KB, created by Matěj Cepl on 2013-12-02 17:27:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2013-12-02 17:27:45 UTC

Size: 1.48 KB

patch

obsolete

>From b0e832ed5bc0e425240d5e192764db290f944954 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Mon, 2 Dec 2013 18:26:43 +0100
>Subject: [PATCH] python-ordereddict is not required for Fedoras and RHEL > 6.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: MatÄj Cepl <mcepl@redhat.com>
>---
> hg-git.spec | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/hg-git.spec b/hg-git.spec
>index 4753b96..f38e9db 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} > 0 && 0%{?rhel} <= 6
> Requires:       python-ordereddict
>+%endif
> 
> %description
> This is the Hg-Git plugin for Mercurial, adding the ability to push and pull
>@@ -40,6 +42,10 @@ identical - Mercurial data does not get lost in translation.
> %{python2_sitelib}/*.egg-info/
> 
> %changelog
>+* Mon Dec 02 2013 MatÄj Cepl <mcepl@redhat.com> - 0.4.0-4
>+- Previous fix was too aggressive ... we need python-ordereddict only on
>+  EPEL-6.
>+
> * Fri Nov 08 2013 Christopher Meng <rpm@cicku.me> - 0.4.0-3
> - Add missing ordereddict requires.
> 
>-- 
>1.8.5
>

Actions: View | Diff

Attachments on bug 1036831: 831700