[httpie/el6] This might make it able to build on EPEL6 now.

Ricky Elrod codeblock at fedoraproject.org
Thu Sep 5 15:20:51 UTC 2013


commit 91640c4d16090ae5e9dd5086939ad1ea21d6e4ff
Author: Ricky Elrod <ricky at elrod.me>
Date:   Thu Sep 5 11:20:38 2013 -0400

    This might make it able to build on EPEL6 now.

 httpie.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/httpie.spec b/httpie.spec
index 7d80b3b..def3007 100644
--- a/httpie.spec
+++ b/httpie.spec
@@ -4,7 +4,7 @@
 
 Name:           httpie
 Version:        0.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Curl-like tool for humans
 
 Group:          Applications/Internet
@@ -14,18 +14,18 @@ Source0:        http://pypi.python.org/packages/source/h/httpie/httpie-%{version
 BuildRequires:  python2-devel
 
 # Needed so we can build the manpage with help2man without fataling.
-BuildRequires:  python-pygments = 1.4
+BuildRequires:  python-pygments
 BuildRequires:  python-requests
 BuildRequires:  help2man
 
-Requires:       python-pygments = 1.4
+Requires:       python-pygments
 Requires:       python-requests
 
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 
 # Needed so we can build the manpage with help2man without fataling.
-BuildRequires:  python3-pygments = 1.4
+BuildRequires:  python3-pygments
 BuildRequires:  python3-requests
 %endif
 
@@ -47,7 +47,7 @@ Group:          Applications/Internet
 
 %if 0%{?with_python3}
 Requires:       python3
-Requires:       python3-pygments = 1.4
+Requires:       python3-pygments
 Requires:       python3-requests
 %endif
 
@@ -66,9 +66,9 @@ responses.
 sed -i '/#!\/usr\/bin\/env/d' %{name}/__main__.py
 
 # Fedora currently only ships with Pygments 1.4 but httpie wants 1.5.
-# However, it seems to work just fine with 1.4, and when the Fedora package
-# gets updated, we can, and should, nuke this.
-sed -i 's/Pygments>=1.5/Pygments>=1.4/' setup.py
+# Also, RHEL currently only ships with Pygments 1.1.
+# However, it seems to work just fine with lower versions.
+sed -i 's/Pygments>=1.5/Pygments>=1.1/' setup.py
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -121,6 +121,9 @@ help2man --no-discard-stderr %{buildroot}/%{_bindir}/python3-http > %{buildroot}
 %endif
 
 %changelog
+* Thu Sep 5 2013 Ricky Elrod <codeblock at fedoraproject.org> - 0.6.0-5
+- Loosen the requirement on python-pygments.
+
 * Tue Jul 2 2013 Ricky Elrod <codeblock at fedoraproject.org> - 0.6.0-4
 - python-requests 1.2.3 exists in rawhide now.
 


More information about the scm-commits mailing list