Merge branch 'master' into f22
This commit is contained in:
commit
3915c053e2
3 changed files with 16 additions and 4 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -7,3 +7,4 @@
|
|||
/urllib3-1.10.1.tar.gz
|
||||
/urllib3-1.10.2.tar.gz
|
||||
/urllib3-1.10.3.tar.gz
|
||||
/urllib3-585983ab3f7fb7a0e0b223ebdab1b45471dbefe4.tar.gz
|
||||
|
|
|
|||
|
|
@ -4,6 +4,13 @@
|
|||
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
%endif
|
||||
|
||||
%global commit 585983ab3f7fb7a0e0b223ebdab1b45471dbefe4
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global checkout 20150429git%{shortcommit}
|
||||
|
||||
%global gh_owner shazow
|
||||
%global gh_project urllib3
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
|
@ -12,12 +19,12 @@
|
|||
|
||||
Name: python-%{srcname}
|
||||
Version: 1.10.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2.%{checkout}%{?dist}
|
||||
Summary: Python HTTP library with thread-safe connection pooling and file post
|
||||
|
||||
License: MIT
|
||||
URL: http://urllib3.readthedocs.org/
|
||||
Source0: http://pypi.python.org/packages/source/u/%{srcname}/%{srcname}-%{version}.tar.gz
|
||||
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{commit}/%{gh_project}-%{commit}.tar.gz
|
||||
Source1: ssl_match_hostname_py3.py
|
||||
|
||||
# Remove logging-clear-handlers from setup.cfg because it's not available in RHEL6's nose
|
||||
|
|
@ -68,7 +75,8 @@ Python3 HTTP module with connection pooling and file POST abilities.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{srcname}-%{version}
|
||||
#%%setup -q -n %{srcname}-%{version}
|
||||
%setup -q -n %{gh_project}-%{commit}
|
||||
|
||||
# Drop the dummyserver tests in koji. They fail there in real builds, but not
|
||||
# in scratch builds (weird).
|
||||
|
|
@ -167,6 +175,9 @@ rm -rf %{buildroot}/%{python3_sitelib}/__pycache__*
|
|||
%endif # with_python3
|
||||
|
||||
%changelog
|
||||
* Wed Apr 29 2015 Ralph Bean <rbean@redhat.com> - 1.10.3-2.20150429git585983a
|
||||
- Grab a git snapshot to get around this chunked encoding failure.
|
||||
|
||||
* Wed Apr 22 2015 Ralph Bean <rbean@redhat.com> - 1.10.3-1
|
||||
- new version
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
82fd4811f6164fcac0f8e959843c4a63 urllib3-1.10.3.tar.gz
|
||||
849ca91041e41ae0dd583b04b22cc242 urllib3-585983ab3f7fb7a0e0b223ebdab1b45471dbefe4.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue