From 0c070310734a1367100c97dcb440c39cadc0694e Mon Sep 17 00:00:00 2001 From: lei_ju <983277505@qq.com> Date: Fri, 30 Oct 2020 14:26:09 +0800 Subject: [PATCH] Remove subpackage python2-cheetah --- python-cheetah.spec | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/python-cheetah.spec b/python-cheetah.spec index 284d45c..932c076 100644 --- a/python-cheetah.spec +++ b/python-cheetah.spec @@ -1,12 +1,11 @@ Name: python-cheetah Version: 3.1.0 -Release: 8 +Release: 9 Summary: The Python-Powered Template Engine License: MIT URL: http://cheetahtemplate.org/ Source: https://pypi.python.org/packages/54/86/ea50bb5baf1daa8ca1a56774d48150a69376679d27c4130848702efc378c/Cheetah3-3.1.0.tar.gz -BuildRequires: gcc python2-devel python2-setuptools python2-markdown python2-pygments -BuildRequires: python3-devel python3-setuptools python3-markdown python3-pygments +BuildRequires: gcc python3-devel python3-setuptools python3-markdown python3-pygments Patch0001: cheetah-3.0.0-dont-run-tests-twice.patch Patch0002: fix-the-regressions-test-error.patch @@ -20,13 +19,6 @@ At its core, Cheetah is a domain-specific language for markup generation and tem which allows for full integration with existing Python code but also offers extensions to traditional Python syntax to allow for easier text-generation. -%package -n python2-cheetah -Summary: The Python-Powered Template Engine -%{?python_provide:%python_provide python2-cheetah} - -%description -n python2-cheetah -The Python-Powered Template Engine - %package -n python3-cheetah Summary: The Python-Powered Template Engine %{?python_provide:%python_provide python3-cheetah} @@ -39,27 +31,15 @@ The Python-Powered Template Engine %{__sed} -i -e '/^#!/,1d' Cheetah/Tests/* Cheetah/DirectiveAnalyzer.py Cheetah/Utils/Misc.py %build -%py2_build %py3_build %install -%py2_install - -EGG_INFO=(%{buildroot}/%{python2_sitearch}/Cheetah*.egg-info) -cp -r $EGG_INFO ${EGG_INFO//Cheetah3/Cheetah} -sed -i "s/Name: Cheetah3/Name: Cheetah/" ${EGG_INFO//Cheetah3/Cheetah}/PKG-INFO - %py3_install %check export PATH="%{buildroot}/%{_bindir}:$PATH" PYTHONPATH="%{buildroot}/%{python3_sitearch}" %{buildroot}/%{_bindir}/cheetah test -%files -n python2-cheetah -%license LICENSE -%doc ANNOUNCE.rst README.rst TODO BUGS -%{python2_sitearch}/ - %files -n python3-cheetah %license LICENSE %doc ANNOUNCE.rst README.rst TODO BUGS @@ -67,6 +47,9 @@ export PATH="%{buildroot}/%{_bindir}:$PATH" PYTHONPATH="%{buildroot}/%{python3_s %{python3_sitearch}/ %changelog +* Wed Oct 21 2020 chengzihan - 3.1.0-9 +- Remove subpackage python2-cheetah + * Wed Jun 24 2020 wangchong - 3.1.0-8 - fix the tests error