From 0e6adbc64a9d0cdf0a8c64ca22a21be52ca8865a Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Apr 2021 10:57:43 +0800 Subject: [PATCH] Remove python2-reportlab for no more buildrequire: python2-pillow --- python-reportlab.spec | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/python-reportlab.spec b/python-reportlab.spec index 8f137f3..c265819 100644 --- a/python-reportlab.spec +++ b/python-reportlab.spec @@ -2,7 +2,7 @@ Name: python-reportlab Version: 3.4.0 -Release: 11 +Release: 12 Summary: ReportLab library to create PDF documents and graphic License: BSD URL: https://www.reportlab.com/ @@ -12,15 +12,6 @@ Patch0001: 0fbf25e4857423f6a38ca7f5aeee1c84acaa3fc1.patch %description The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics. -%package -n python2-reportlab -Summary: ReportLab library to create PDF documents and graphic -BuildRequires: gcc freetype-devel ghostscript python2-devel python2-pillow libart_lgpl-devel -Requires: dejavu-sans-fonts python2-pillow -%{?python_provide:%python_provide python2-reportlab} - -%description -n python2-reportlab -The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics. - %package -n python3-reportlab Summary: ReportLab library to create PDF documents and graphic BuildRequires: python3-devel python3-pillow @@ -48,33 +39,16 @@ find src -name '*.py' | xargs sed -i -e '/^#!\//d' sed -i '/\~\/\.local\/share\/fonts\/CMap/i''\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ '\'"%{cmapdir}"\''\,' \ src/reportlab/rl_settings.py -rm -rf %{py3dir} -cp -a . %{py3dir} %build -CFLAGS="%{optflags}" %py2_build -pushd %{py3dir} CFLAGS="%{optflags}" %py3_build -popd -PYTHONPATH="`pwd`/`ls -d build/lib*`" %{__python2} docs/genAll.py +PYTHONPATH="`pwd`/`ls -d build/lib*`" %{__python3} docs/genAll.py %install -%py2_install -pushd %{py3dir} %py3_install -popd %check -%{__python2} setup.py tests -pushd %{py3dir} %{__python3} setup.py tests -popd - -%files -n python2-reportlab -%doc README.txt CHANGES.md -%license LICENSE.txt -%{python2_sitearch}/{reportlab/,reportlab-%{version}-py%{python2_version}.egg-info} -%exclude %{python2_sitearch}/reportlab/fonts %files -n python3-reportlab %doc README.txt CHANGES.md @@ -85,6 +59,9 @@ popd %doc demos/ tools/ %changelog +* Thu Apr 22 2021 Senlin Xia - 3.4.0-12 +- Remove python2-reportlab for no more buildrequire: python2-pillow + * Fri Aug 21 2020 shixuantong - 3.4.0-11 - add release version for rebuild -- Gitee