- updated to 0.12.18

diff --git a/python-bottle.spec b/python-bottle.spec
index c9fe3bd7ba712cd2502ed2735792b93e56f1fdb6..63b1dc018e664b7ee37dff4d8d84917dd6cc14c6 100644 (file)
--- a/python-bottle.spec
+++ b/python-bottle.spec
@@ -3,27 +3,26 @@
 # Conditional build:
 %bcond_without python2         # build python 2 module
 %bcond_without python3         # build python 3 module
-%bcond_with    tests           # unit/functional tests [a few fail as of 0.12.13]
+%bcond_with    tests           # unit/functional tests [one fails on py3 as of 0.12.18, probably network is used]
 #
 %define        module  bottle
 #
 Summary:       Fast and simple WSGI-framework for small web-applications
 Summary(pl.UTF-8):     Szybki i prosty szkielet WSGI dla małych aplikacji sieciowych
 Name:          python-%{module}
-Version:       0.12.13
-Release:       2
+Version:       0.12.18
+Release:       1
 License:       MIT
 Group:         Development/Languages/Python
 #Source0Download: https://pypi.org/simple/bottle/
 Source0:       https://files.pythonhosted.org/packages/source/b/bottle/%{module}-%{version}.tar.gz
-# Source0-md5: d2fe1b48c1d49217e78bf326b1cad437
+# Source0-md5: a00b7e9a1ab3be7c19c1235fea2ccb40
 URL:           http://bottlepy.org/
 %if %{with python2}
 BuildRequires: python-modules >= 1:2.5
 BuildRequires: python-setuptools
 %endif
 %if %{with python3}
-#BuildRequires:        python3-2to3 >= 1:3.2
 BuildRequires: python3-devel >= 1:3.2
 BuildRequires: python3-modules >= 1:3.2
 BuildRequires: python3-setuptools
@@ -78,7 +77,7 @@ standardowej biblioteki Pythona.
 %py_build
 
 %if %{with tests}
-%{__python} -m unittest discover -s test
+%{__python} test/testall.py
 %endif
 %endif
 
@@ -86,7 +85,7 @@ standardowej biblioteki Pythona.
 %py3_build
 
 %if %{with tests}
-%{__python3} -m unittest discover -s test
+%{__python3} test/testall.py
 %endif
 %endif
 
@@ -117,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.rst
 %attr(755,root,root) %{_bindir}/bottle-2
 %{py_sitescriptdir}/bottle.py[co]
-%{py_sitescriptdir}/bottle-%{version}-*.egg-info
+%{py_sitescriptdir}/bottle-%{version}-py*.egg-info
 %endif
 
 %if %{with python3}
@@ -128,5 +127,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/bottle-3
 %{py3_sitescriptdir}/bottle.py
 %{py3_sitescriptdir}/__pycache__/bottle.cpython-*.py[co]
-%{py3_sitescriptdir}/bottle-%{version}-*.egg-info
+%{py3_sitescriptdir}/bottle-%{version}-py*.egg-info
 %endif