diff --git a/python-tw2-core-without-kajiki.patch b/python-tw2-core-without-kajiki.patch new file mode 100644 index 0000000..bc77e79 --- /dev/null +++ b/python-tw2-core-without-kajiki.patch @@ -0,0 +1,47 @@ +diff -ur ./tw2.core-2.2.6/setup.py ./tw2.core-2.2.6.sal/setup.py +--- ./tw2.core-2.2.6/setup.py 2019-04-09 22:44:17.000000000 +0200 ++++ ./tw2.core-2.2.6.sal/setup.py 2019-10-03 16:10:00.536095831 +0200 +@@ -35,7 +35,7 @@ + _extra_mako = ["Mako >= 0.1.1"] + _extra_jinja = ["jinja2"] + _extra_chameleon = ["chameleon"] +-_extra_kajiki = ["kajiki >= 0.5.0"] ++_extra_kajiki = [] #["kajiki >= 0.5.0"] + + requires = [ + 'WebOb>=0.9.7', +@@ -84,7 +84,7 @@ + 'genshi': _extra_genshi, + 'mako': _extra_mako, + 'jinja': _extra_jinja, +- 'kajiki': _extra_kajiki, ++ #'kajiki': _extra_kajiki, + 'chameleon': _extra_chameleon, + 'test': tests_require, + 'tests': tests_require, +diff -ur ./tw2.core-2.2.6/tests/test_template.py ./tw2.core-2.2.6.sal/tests/test_template.py +--- ./tw2.core-2.2.6/tests/test_template.py 2019-03-10 21:46:18.000000000 +0100 ++++ ./tw2.core-2.2.6.sal/tests/test_template.py 2019-10-03 16:06:04.499419171 +0200 +@@ -16,8 +16,8 @@ + # TBD: only test engines that are installed + engines = ['genshi', 'mako', 'jinja', 'chameleon'] + +-if not six.PY3: +- engines.append('kajiki') ++#if not six.PY3: ++# engines.append('kajiki') + + + # Python 2.5 support shim. TODO -- remove this in the future. +diff -ur ./tw2.core-2.2.6/tw2/core/testbase/base.py ./tw2.core-2.2.6.sal/tw2/core/testbase/base.py +--- ./tw2.core-2.2.6/tw2/core/testbase/base.py 2019-03-10 21:46:18.000000000 +0100 ++++ ./tw2.core-2.2.6.sal/tw2/core/testbase/base.py 2019-10-03 16:21:21.091519454 +0200 +@@ -195,6 +195,8 @@ + + def _get_all_possible_engines(self): + for engine in templating._default_rendering_extension_lookup: ++ if engine == "kajiki": ++ continue # ignore kajiki test in Fedora + yield engine + + def _check_rendering_vs_expected(self, engine, attrs, params, expected): diff --git a/python-tw2-core.spec b/python-tw2-core.spec index c95c9ce..c02ce92 100644 --- a/python-tw2-core.spec +++ b/python-tw2-core.spec @@ -2,7 +2,7 @@ Name: python-tw2-core Version: 2.2.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Web widget creation toolkit based on TurboGears widgets License: MIT @@ -12,6 +12,9 @@ Source0: https://pypi.python.org/packages/source/t/%{modname}/%{modname}- # python3.8 patch Patch1: python-tw2-core-py38.patch +# remove kajiki support because of broken dependencies on Fedora +Patch2: python-tw2-core-without-kajiki.patch + BuildArch: noarch # For building, generally @@ -27,7 +30,6 @@ BuildRequires: python3-paste-deploy BuildRequires: python3-six # Specifically for the test suite -BuildRequires: python3-unittest2 BuildRequires: python3-nose BuildRequires: python3-coverage BuildRequires: python3-formencode @@ -38,7 +40,7 @@ BuildRequires: python3-sieve BuildRequires: python3-mako BuildRequires: python3-genshi BuildRequires: python3-chameleon -BuildRequires: python3-kajiki +#BuildRequires: python3-kajiki BuildRequires: python3-jinja2 %description @@ -74,6 +76,7 @@ This package contains the python3 version of the toolkit %prep %setup -q -n %{modname}-%{version} %patch1 -p1 +%patch2 -p2 %build # Fix shebang for python3 @@ -95,6 +98,11 @@ PYTHONPATH=$(pwd) %{__python3} setup.py test %{python3_sitelib}/%{modname}-%{version}* %changelog +* Thu Oct 03 2019 Ján ONDREJ (SAL) - 2.2.6-6 +- Removed unittest2 dependency. Not used anymore. +- Removed kajiki support because kajiki has broken dependencies + in Fedora (python-nine). + * Mon Sep 02 2019 Ján ONDREJ (SAL) - 2.2.6-5 - Removed python3-nine as dependency. Not used anymore.