[python-requests/el6: 5/6] Merge branch 'master' into el6

[Ralph Bean ☃]

commit 6f0f8dc86557ed1b8d6c12a8946371cfe46e2431
Merge: 26bd8cc 2f898f2
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu Feb 28 12:39:59 2013 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	python-requests.spec

 .gitignore                                       |    1 +
 python-requests-system-cert-bundle.patch         |   44 ++++++++
 python-requests-system-chardet-not-charade.patch |   25 +++++
 python-requests-system-urllib3.patch             |   81 +++++++++++++++
 python-requests.spec                             |  121 ++++++++++++++++++----
 sources                                          |    2 +-
 6 files changed, 251 insertions(+), 23 deletions(-)
---
diff --cc python-requests.spec
index a6082c3,31e2386..1c773e3
--- a/python-requests.spec
+++ b/python-requests.spec
@@@ -10,21 -9,32 +9,37 @@@ Version:        1.1.
  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
- # The following patch is a backport and is discussed here:
- # https://github.com/fedora-infra/python-fedora/pull/6
- Patch0:         %{name}-cookie-handling.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 
@@@ -43,17 -58,43 +63,44 @@@ 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
+ %patch2 -p1
+ 
+ # Unbundle the certificate bundle from mozilla.
+ rm -rf requests/cacert.pem
+ 
+ %if 0%{?_with_python3}
+ rm -rf %{py3dir}
+ cp -a . %{py3dir}
+ %endif # with_python3
+ 
  %build
  %if 0%{?_with_python3}
+ pushd %{py3dir}
  %{__python3} setup.py build
+ 
+ # Unbundle chardet.  Patch1 switches usage to system chardet.
+ rm -rf build/lib/requests/packages/charade
+ 
+ # Unbundle urllib3.  Patch1 switches usage to system urllib3.
+ rm -rf build/lib/requests/packages
+ 
+ popd
  %endif
+ 
  %{__python} setup.py build
  
+ # Unbundle chardet.  Patch1 switches usage to system chardet.
+ rm -rf build/lib/requests/packages/charade
+ 
+ # Unbundle urllib3.  Patch1 switches usage to system urllib3.
+ rm -rf build/lib/requests/packages
+ 
  %install
  rm -rf $RPM_BUILD_ROOT
  %if 0%{?_with_python3}
@@@ -83,14 -128,33 +134,40 @@@ 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
+   in.
+ - Use the certificates in the ca-certificates package instead of the bundled one
+   + https://bugzilla.redhat.com/show_bug.cgi?id=904614
+ - Fix a problem with cookie handling
+   + https://bugzilla.redhat.com/show_bug.cgi?id=906924
+ 
 +* Thu Jan 31 2013 Ralph Bean <rbean at redhat.com> 0.14.1-3
 +- Introduced backport patch to support better cookie handling.
 +
 +* Mon Jan 28 2013 Ralph Bean <rbean at redhat.com> 0.14.1-2
 +- Merged latest rawhide into el6.
 +
  * Wed Oct 22 2012 Arun S A G <sagarun at gmail.com>  0.14.1-1
  - Updated to latest upstream release