[httpie/f19: 7/7] Merge branch 'master' into f19

[Ricky Elrod]

commit 82e5c8dfd82a7a0dc71f20dd4d5ee89de2282882
Merge: 9fdc89b 3cb04ec
Author: Ricky Elrod <ricky at elrod.me>
Date:   Sat Sep 28 19:07:24 2013 -0400

    Merge branch 'master' into f19
    
    Conflicts:
    	httpie.spec

 .gitignore  |    1 +
 httpie.spec |   47 ++++++++++++++++++++++++++++++++++++-----------
 sources     |    2 +-
 3 files changed, 38 insertions(+), 12 deletions(-)
---
diff --cc httpie.spec
index a92fd0c,a569f9d..5b6cdb9
--- a/httpie.spec
+++ b/httpie.spec
@@@ -66,14 -68,10 +68,14 @@@ 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
  
 +# Fedora currently only ships with python-requests 1.1.0 but httpie wants
 +# 1.2.3.
 +sed -i 's/requests>=1.2.3/requests>=1.1.0/' setup.py
 +
  %if 0%{?with_python3}
  rm -rf %{py3dir}
  cp -a . %{py3dir}