From 5bcabf0a430a311535ce7b2eb81d34977b48bc55 Mon Sep 17 00:00:00 2001 From: wangxiao65 <287608437@qq.com> Date: Thu, 29 Oct 2020 11:38:44 +0800 Subject: [PATCH] drop python2 subpackage --- nototools.spec | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/nototools.spec b/nototools.spec index 8069681..23d8877 100644 --- a/nototools.spec +++ b/nototools.spec @@ -3,7 +3,7 @@ Name: nototools Version: 0 -Release: 1.20190712.git%{shortcommit0} +Release: 2 Summary: Noto fonts support tools and scripts plus web site generation License: ASL 2.0 URL: https://github.com/googlei18n/nototools @@ -12,8 +12,8 @@ Patch0000: nototools-fixes-indent.patch Patch0001: nototools-python3.patch Patch0002: nototools-python3-replace-two-more-xrange-with-range.patch BuildArch: noarch -BuildRequires: python2-devel python3-devel -Requires: python2-nototools = %{version}-%{release} python3-nototools = %{version}-%{release} +BuildRequires: python3-devel +Requires: python3-nototools = %{version}-%{release} %description The tools package contains python scripts, \ @@ -32,28 +32,14 @@ BuildRequires: python3dist(fonttools) %description -n python3-nototools The tools package contains python3 scripts. -%package -n python2-nototools -Summary: Noto tools for python 2 -Requires: python2dist(fonttools) -BuildRequires: python2dist(fonttools) - -%description -n python2-nototools -The tools package contains python2 scripts. - - %prep %autosetup -c -p0 rm -rf nototools-%{commit0}/third_party/{cldr,dspl,fontcrunch,ohchr,spiro,udhr,unicode} -mv %{name}-%{commit0} python2 -cp -a python2 python3 -cp python2/*.md python2/LICENSE . +mv %{name}-%{commit0} python3 +cp python3/*.md python3/LICENSE . %build -cd python2 -%py2_build -cd .. - cd python3 %py3_build cd .. @@ -68,20 +54,6 @@ for lib in %{buildroot}%{python3_sitelib}/nototools/*.py; do done cd .. -cd python2 -%py2_install -for lib in %{buildroot}%{python2_sitelib}/nototools/*.py; do - sed '1{\@^#!/usr/bin/env python@d}' $lib > $lib.new && - touch -r $lib $lib.new && - mv $lib.new $lib -done -cd .. - -%check -cd python2 -%{__python2} setup.py test -cd .. - %files %license LICENSE %{_bindir}/*.py @@ -91,11 +63,6 @@ cd .. %files help %doc CONTRIBUTING.md README.md -%files -n python2-nototools -%{python2_sitelib}/nototools -%{python2_sitelib}/nototools-0.0.1-py2.7.egg-info -%{python2_sitelib}/third_party - %files -n python3-nototools %{python3_sitelib}/nototools %{python3_sitelib}/nototools-0.0.1-py3.?.egg-info @@ -103,5 +70,8 @@ cd .. %changelog +* Wed Oct 21 2020 wangxiao - 0-2 +- drop python2 subpackage + * Thu Nov 21 2019 zhujunhao - 0-1.20190712.git9c4375f - Initial package -- Gitee