Merge branch 'f17' of ssh://pkgs.fedoraproject.org/python-requests into f17

Conflicts: python-requests.spec
Merge branch 'master' into f17
2013-02-28 12:42:33 -05:00 · 2013-02-28 12:38:33 -05:00 · 2013-02-08 13:43:29 -08:00 · 2012-10-25 00:48:13 +05:30 · 2012-06-10 23:03:38 +05:30
1 changed files with 3 additions and 1 deletions
--- a/python-requests.spec
+++ b/python-requests.spec
@ -3,7 +3,8 @@
 %else
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
-
+# Turn off the brp-python-bytecompile script
 #%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 Name:           python-requests
 Version:        1.1.0
 Release:        3%{?dist}
@ -24,6 +25,7 @@ Patch2:         python-requests-system-urllib3.patch
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-chardet
 BuildRequires:  python-urllib3
Author	SHA1	Message	Date
Ralph Bean	ca181ea14e	Merge branch 'f17' of ssh://pkgs.fedoraproject.org/python-requests into f17 Conflicts: python-requests.spec	2013-02-28 12:42:33 -05:00
Ralph Bean	fae896e5ee	Merge branch 'master' into f17 Conflicts: .gitignore python-requests.spec sources	2013-02-28 12:38:33 -05:00
Toshio Kuratomi	79e36b0775	Merge branch 'master' into f17 Conflicts: python-requests.spec	2013-02-08 13:43:29 -08:00
Arun SAG	97149a4b2f	Updated to requests 0.14.1	2012-10-25 00:48:13 +05:30
Arun SAG	8afe421f38	Updated to 0.13.1	2012-06-10 23:03:38 +05:30