[python-requests/el6: 6/6] Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-requests into el6

[Ralph Bean ☃]

commit 29a02acf6040cc1681b6a509759c72e39ea457c8
Merge: 6f0f8dc 26f05ae
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu Feb 28 12:43:25 2013 -0500

    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-requests into el6
    
    Conflicts:
    	python-requests.spec

 python-requests.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --cc python-requests.spec
index 1c773e3,404a37b..b2664f3
--- a/python-requests.spec
+++ b/python-requests.spec
@@@ -3,43 -3,25 +3,39 @@@
  %else
  %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
  %endif
 +
  Name:           python-requests
 -Version:        0.14.1
 -Release:        4%{?dist}
 +Version:        1.1.0
 +Release:        3%{?dist}
  Summary:        HTTP library, written in Python, for human beings
  
 -License:        ISC and MIT
 +License:        ASL 2.0
  URL:            http://pypi.python.org/pypi/requests
  Source0:        http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz
 -# Separate response cookies from request cookies discussed here:
 -# https://github.com/fedora-infra/python-fedora/pull/6
 -Patch0: python-requests-cookie-handling.patch
 -# Use the system certificates in ca-certificates.  This patch causes util.py
 -# to search for the system bundle (whereas now the return value of
 -# certs.where() causes it to always use the bundled version.
 -Patch1: python-requests-system-cert-bundle.patch
 +# Explicitly use the system certificates in ca-certificates.
 +# https://bugzilla.redhat.com/show_bug.cgi?id=904614
 +Patch0:         python-requests-system-cert-bundle.patch
 +# Unbundle python-charade (a fork of python-chardet).
 +# https://bugzilla.redhat.com/show_bug.cgi?id=904623
 +Patch1:         python-requests-system-chardet-not-charade.patch
 +# Unbundle python-charade (a fork of python-urllib3).
 +# https://bugzilla.redhat.com/show_bug.cgi?id=904623
 +Patch2:         python-requests-system-urllib3.patch
 +
  BuildArch:      noarch
 +
  BuildRequires:  python2-devel
 +BuildRequires:  python-chardet
 +BuildRequires:  python-urllib3
  
- Requires:       python-certifi
- %if 0%{?fedora}
- Requires:       python-gevent
- %endif
  Requires:       ca-certificates
 +Requires:       python-chardet
 +Requires:       python-urllib3
 +
 +%if 0%{?rhel}
 +BuildRequires:  python-ordereddict
 +Requires:       python-ordereddict
 +%endif
  
  %description
  Most existing Python modules for sending HTTP requests are extremely verbose and 
@@@ -63,9 -40,9 +59,8 @@@ capabilities you should need, but the A
  designed to make HTTP requests easy for developers.
  %endif
  
 -
  %prep
  %setup -q -n requests-%{version}
- %patch0 -p1 -b .cookies
  
  %patch0 -p1
  %patch1 -p1
@@@ -134,25 -110,8 +129,24 @@@ pop
  %{python3_sitelib}/requests/
  %endif
  
 -
  %changelog
- 
 +* Thu Feb 28 2013 Ralph Bean <rbean at redhat.com> - 1.1.0-3
 +- Unbundled python-urllib3.  Using system python-urllib3 now.
 +- Conditionally include python-ordereddict for el6.
 +
 +* Wed Feb 27 2013 Ralph Bean <rbean at redhat.com> - 1.1.0-2
 +- Unbundled python-charade/chardet.  Using system python-chardet now.
 +- Removed deprecated comments and actions against oauthlib unbundling.
 +  Those are no longer necessary in 1.1.0.
 +- Added links to bz tickets over Patch declarations.
 +
 +* Tue Feb 26 2013 Ralph Bean <rbean at redhat.com> - 1.1.0-1
 +- Latest upstream.
 +- Relicense to ASL 2.0 with upstream.
 +- Removed cookie handling patch (fixed in upstream tarball).
 +- Updated cert unbundling patch to match upstream.
 +- Added check section, but left it commented out for koji.
 +
  * Fri Feb  8 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.14.1-4
  - Let brp_python_bytecompile run again, take care of the non-python{2,3} modules
    by removing them from the python{,3}-requests package that they did not belong