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

[Toshio くらとみ]

commit 26f05ae4508e1cb11acf6d847da9e9449bc5f484
Merge: 26bd8cc 4d0266e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Feb 8 13:54:49 2013 -0800

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

 python-requests-system-cert-bundle.patch |   16 ++++++
 python-requests.spec                     |   82 +++++++++++++++++++++--------
 2 files changed, 75 insertions(+), 23 deletions(-)
---
diff --cc python-requests.spec
index a6082c3,9dc34dd..404a37b
--- a/python-requests.spec
+++ b/python-requests.spec
@@@ -85,12 -112,15 +112,21 @@@ pop
  
  
  %changelog
+ * 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