diff --git a/.gitignore b/.gitignore index afd0c7a..f86a855 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ tornado-1.0.1.tar.gz /tornado-2.1.1.tar.gz /tornado-2.2.tar.gz /tornado-2.2.1.tar.gz +/tornado-3.2.1.tar.gz diff --git a/python-tornado.spec b/python-tornado.spec index 2385994..88b0b14 100644 --- a/python-tornado.spec +++ b/python-tornado.spec @@ -7,18 +7,19 @@ %global pkgname tornado Name: python-%{pkgname} -Version: 2.2.1 -Release: 7%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: Scalable, non-blocking web server and tools Group: Development/Libraries License: ASL 2.0 URL: http://www.tornadoweb.org -Source0: http://github.com/downloads/facebook/%{pkgname}/%{pkgname}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/source/t/tornado/tornado-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: python-devel +BuildRequires: python-backports-ssl_match_hostname +Requires: python-backports-ssl_match_hostname Requires: python-pycurl Requires: python-simplejson %if 0%{?with_python3} @@ -114,18 +115,20 @@ rm -rf %{buildroot} %if "%{dist}" != ".el6" %if 0%{?with_python3} pushd %{py3dir} - python3 -m unittest discover -s tornado/test -p *test.py || : + PYTHONPATH=%{python3_sitelib} \ + python3 -m tornado.test.runtests --verbose || : popd %endif # with_python3 - python -m unittest discover -s tornado/test -p *test.py + PYTHONPATH=%{python_sitelib} \ + python -m tornado.test.runtests --verbose %endif %files %defattr(-,root,root,-) -%doc README PKG-INFO +%doc README.rst PKG-INFO -%{python_sitelib}/%{pkgname}/ -%{python_sitelib}/%{pkgname}-%{version}-*.egg-info +%{python_sitearch}/%{pkgname}/ +%{python_sitearch}/%{pkgname}-%{version}-*.egg-info %files doc %defattr(-,root,root,-) @@ -134,10 +137,10 @@ rm -rf %{buildroot} %if 0%{?with_python3} %files -n python3-tornado %defattr(-,root,root,-) -%doc README PKG-INFO +%doc README.rst PKG-INFO -%{python3_sitelib}/%{pkgname}/ -%{python3_sitelib}/%{pkgname}-%{version}-*.egg-info +%{python3_sitearch}/%{pkgname}/ +%{python3_sitearch}/%{pkgname}-%{version}-*.egg-info %files -n python3-tornado-doc %defattr(-,root,root,-) @@ -146,6 +149,10 @@ rm -rf %{buildroot} %changelog +* Thu May 22 2014 Thomas Spura - 3.2.1-1 +- update to 3.2.1 +- no noarch anymore + * Wed May 14 2014 Bohuslav Kabrda - 2.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 diff --git a/sources b/sources index d2c387d..8416164 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad8d943262bff57ef1b8f7b6d502ba04 tornado-2.2.1.tar.gz +d11986d4639aa9f71a31da1ebf40dc19 tornado-3.2.1.tar.gz