diff --git a/.gitignore b/.gitignore index 619674c..ef0c456 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /urllib3-1.10.3.tar.gz /urllib3-585983ab3f7fb7a0e0b223ebdab1b45471dbefe4.tar.gz /urllib3-a91975b77a2e28394859487fe5ebbf4a3a74e634.tar.gz +/urllib3-1.10.4.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index f4dd65a..3a4331f 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,13 +4,6 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -%global commit a91975b77a2e28394859487fe5ebbf4a3a74e634 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global checkout 20150503git%{shortcommit} - -%global gh_owner shazow -%global gh_project urllib3 - %if 0%{?fedora} %global with_python3 1 %endif @@ -19,12 +12,12 @@ Name: python-%{srcname} Version: 1.10.4 -Release: 5.%{checkout}%{?dist} +Release: 6%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT URL: http://urllib3.readthedocs.org/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{commit}/%{gh_project}-%{commit}.tar.gz +Source0: https://pypi.python.org/packages/source/u/%{srcname}/%{srcname}-%{version}.tar.gz # Only used for python3 (and for python2 on F22 and newer) Source1: ssl_match_hostname_py3.py @@ -96,8 +89,7 @@ Python3 HTTP module with connection pooling and file POST abilities. %prep -#%%setup -q -n %{srcname}-%{version} -%setup -q -n %{gh_project}-%{commit} +%setup -q -n %{srcname}-%{version} # Drop the dummyserver tests in koji. They fail there in real builds, but not # in scratch builds (weird). @@ -224,6 +216,9 @@ rm -rf %{buildroot}/%{python3_sitelib}/__pycache__* %endif # with_python3 %changelog +* Sat Oct 10 2015 Ralph Bean - 1.10.4-6 +- Sync from PyPI instead of a git checkout. + * Tue Sep 08 2015 Ralph Bean - 1.10.4-5.20150503gita91975b - Drop requirement on python-backports-ssl_match_hostname on F22 and newer. diff --git a/sources b/sources index e6b149a..f8544dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -438d002da54aecca77c7f1d640fcf377 urllib3-a91975b77a2e28394859487fe5ebbf4a3a74e634.tar.gz +517e6c293e1d144ff3e67486d69249c6 urllib3-1.10.4.tar.gz