From d9ee52b45a49944967c8089530f17c08ebb67f89 Mon Sep 17 00:00:00 2001 From: jpzhang Date: Thu, 6 Aug 2020 10:47:43 +0800 Subject: [PATCH] replace obsolete pngmath with imgmath --- ...eplace-obsolete-pngmath-with-imgmath.patch | 26 +++++++++++++++++++ python-kitchen.spec | 9 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 0001-replace-obsolete-pngmath-with-imgmath.patch diff --git a/0001-replace-obsolete-pngmath-with-imgmath.patch b/0001-replace-obsolete-pngmath-with-imgmath.patch new file mode 100644 index 0000000..796f0de --- /dev/null +++ b/0001-replace-obsolete-pngmath-with-imgmath.patch @@ -0,0 +1,26 @@ +diff --git a/kitchen2/docs/conf.py b/kitchen2/docs/conf.py +index 5885d48..b699d95 100644 +--- a/kitchen2/docs/conf.py ++++ b/kitchen2/docs/conf.py +@@ -25,7 +25,7 @@ import kitchen.release + + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig'] ++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig'] + + # Add any paths that contain templates here, relative to this directory. + templates_path = ['_templates'] +diff --git a/kitchen3/docs/conf.py b/kitchen3/docs/conf.py +index 5b70a39..fdc0a3b 100644 +--- a/kitchen3/docs/conf.py ++++ b/kitchen3/docs/conf.py +@@ -25,7 +25,7 @@ import kitchen.release + + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig'] ++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig'] + + # Add any paths that contain templates here, relative to this directory. + templates_path = ['_templates'] diff --git a/python-kitchen.spec b/python-kitchen.spec index 1cd8625..fb1cccd 100644 --- a/python-kitchen.spec +++ b/python-kitchen.spec @@ -3,7 +3,7 @@ Name: python-kitchen Version: 1.2.6 -Release: 2 +Release: 3 Summary: Small, useful pieces of code to make python coding easier License: LGPLv2+ @@ -18,6 +18,8 @@ BuildRequires: python%{python3_pkgversion}-nose BuildRequires: python%{python3_pkgversion}-test BuildRequires: python%{python3_pkgversion}-chardet +Patch0: 0001-replace-obsolete-pngmath-with-imgmath.patch + %description kitchen includes functions to make gettext easier to use, handling unicode text easier (conversion with bytes, outputting xml, and calculating how many @@ -117,7 +119,10 @@ popd %endif %changelog -* Tue Nov 19 2019 Guoshuai Sun - 1.2.6-2 +* Thu Aug 06 2020 zhangjiapeng - 1.2.6-3 +- replace obsolete pngmath with imgmath + +* Wed Aug 05 2020 Guoshuai Sun - 1.2.6-2 - Del the python2 and fix build error * Sat Feb 15 2020 openEuler Buildteam - 1.2.6-1 -- Gitee