!5 软件包加固第三期 nototools升级

From: @lutkunpeng 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li

nototools-fixes-indent.patch

@@ -1,16 +0,0 @@
-diff -ru nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.orig/nototools/lint_cmap_reqs.py nototools-9c4375f07c9adc00c700c5d252df6a25d7425870/nototools/lint_cmap_reqs.py
---- nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.orig/nototools/lint_cmap_reqs.py	2019-03-20 03:30:53.000000000 +0100
-+++ nototools-9c4375f07c9adc00c700c5d252df6a25d7425870/nototools/lint_cmap_reqs.py	2019-07-09 12:33:07.327420528 +0200
-@@ -52,9 +52,9 @@
- 
- 
- def _math_set():
--    """Returns set of characters that should be supported in Noto Math."""
--      ranges = unicode_data._parse_code_ranges(noto_data.MATH_RANGES_TXT)
--        return _code_range_to_set(ranges)
-+  """Returns set of characters that should be supported in Noto Math."""
-+  ranges = unicode_data._parse_code_ranges(noto_data.MATH_RANGES_TXT)
-+  return _code_range_to_set(ranges)
- 
- 
- def _cjk_set():

nototools-python3-replace-two-more-xrange-with-range.patch

@@ -1,23 +0,0 @@
---- nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.orig/nototools/tool_utils.py
-+++ nototools-9c4375f07c9adc00c700c5d252df6a25d7425870/nototools/tool_utils.py
-@@ -446,7 +446,7 @@ def parse_int_ranges(
-     is_range = False
-     start = 0
-     len_limit = -1
--    for i in xrange(len(r)):
-+    for i in range(len(r)):
-       cp = r[i]
-       if cp not in stops:
-         continue
-@@ -613,7 +613,7 @@ def collect_paths(dirs, files):
- 
-   paths = []
-   if dirs:
--    for i in xrange(len(dirs)):
-+    for i in range(len(dirs)):
-       # special case '[noto]' to include all noto font dirs
-       if dirs[i] == '[noto]':
-         dirs[i] = None
--- 
-2.21.0
-

nototools.spec

@@ -1,18 +1,15 @@
-%global commit0 9c4375f07c9adc00c700c5d252df6a25d7425870
+%global commit0 cd79db632c9a506ad61ae72bfad5875341ca56b8
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name:           nototools
-Version:        0
+Version:        0.2.17
-Release:        3
+Release:        1
 Summary:        Noto fonts support tools and scripts plus web site generation
 License:        ASL 2.0
 URL:            https://github.com/googlei18n/nototools
 Source0:        https://github.com/googlei18n/nototools/archive/%{commit0}/nototools-%{shortcommit0}.tar.gz
-Patch0000:      nototools-fixes-indent.patch
-Patch0001:      nototools-python3.patch
-Patch0002:      nototools-python3-replace-two-more-xrange-with-range.patch
 BuildArch:      noarch
-BuildRequires:  python3-devel
+BuildRequires:  python3-devel python-setuptools python3-wheel python3-setuptools_scm
 Requires:       python3-nototools = %{version}-%{release}
 
 %description
@@ -40,11 +37,13 @@ mv %{name}-%{commit0} python3
 cp python3/*.md python3/LICENSE .
 
 %build
+export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
 cd python3
 %py3_build
 cd ..
 
 %install
+export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
 cd python3
 %py3_install
 for lib in %{buildroot}%{python3_sitelib}/nototools/*.py; do
@@ -65,11 +64,14 @@ cd ..
 
 %files -n python3-nototools
 %{python3_sitelib}/nototools
-%{python3_sitelib}/nototools-0.0.1-py%{python3_version}.egg-info
+%{python3_sitelib}/notofonttools-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/third_party
 
 
 %changelog
+* Thu Sep 15 2022 lutcunpeng <lutkunpeng@163.com> - 0.2.17-1
+- DESC: update to 0.2.17
+
 * Wed Apr 6 2022 caodongxia <caodongxia@h-partners.com> - 0-3
 - fix build error caused by python3.10 wildcard