nototools-fixes-indent.patch

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,23 @@
+--- 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,17 +1,19 @@
-%global commit0 cd79db632c9a506ad61ae72bfad5875341ca56b8
+%global commit0 9c4375f07c9adc00c700c5d252df6a25d7425870
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name:           nototools
-Version:        0.2.17
+Version:        0
-Release:        2
+Release:        1.20190712.git%{shortcommit0}
 Summary:        Noto fonts support tools and scripts plus web site generation
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            https://github.com/googlei18n/nototools
 Source0:        https://github.com/googlei18n/nototools/archive/%{commit0}/nototools-%{shortcommit0}.tar.gz
-Patch0:         remove-requireReal-arg-for-fonttools-4.27.0.patch
+Patch0000:      nototools-fixes-indent.patch
+Patch0001:      nototools-python3.patch
+Patch0002:      nototools-python3-replace-two-more-xrange-with-range.patch
 BuildArch:      noarch
-BuildRequires:  python3-devel python-setuptools python3-wheel python3-setuptools_scm
+BuildRequires:  python2-devel python3-devel
-Requires:       python3-nototools = %{version}-%{release}
+Requires:       python2-nototools = %{version}-%{release} python3-nototools = %{version}-%{release}
 
 %description
 The tools package contains python scripts, \
@@ -30,24 +32,33 @@ BuildRequires:  python3dist(fonttools)
 %description    -n python3-nototools
 The tools package contains python3 scripts.
 
-%prep
+%package        -n python2-nototools
-%autosetup -c -p1
+Summary:        Noto tools for python 2
+Requires:       python2dist(fonttools)
+BuildRequires:  python2dist(fonttools)
 
-# fix module 'nototools.notoconfig' has no attribute 'values'
+%description    -n python2-nototools
-sed -i 's/notoconfig.values/notoconfig._values/g' */nototools/autofix_for_release.py
+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} python3
+mv %{name}-%{commit0} python2
-cp python3/*.md python3/LICENSE .
+cp -a python2 python3
+cp python2/*.md python2/LICENSE .
 
 %build
-export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
+cd python2
+%py2_build
+cd ..
+
 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
@@ -57,6 +68,20 @@ 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
@@ -66,24 +91,17 @@ 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}/notofonttools-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/nototools-0.0.1-py3.?.egg-info
 %{python3_sitelib}/third_party
 
 
 %changelog
-* Thu Nov 28 2024 wangkai <13474090681@163.com> - 0.2.17-2
-- Fix autofix_for_release.py noto_lint.py scripts error
-
-* 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
-
-* Wed Oct 21 2020 wangxiao <wangxiao65@huawei.com> - 0-2
-- drop python2 subpackage
-
 * Thu Nov 21 2019 zhujunhao <zhujunhao5@huawei.com> - 0-1.20190712.git9c4375f
 - Initial package

nototools.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: googlefonts/nototools
-tag_prefix: ^v
-seperator: .

remove-requireReal-arg-for-fonttools-4.27.0.patch

@@ -1,31 +0,0 @@
-diff --git a/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/compare_fonts.py b/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/compare_fonts.py
-index b0b9379..48a1746 100755
---- a/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/compare_fonts.py
-+++ b/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/compare_fonts.py
-@@ -182,10 +182,10 @@ class FontCompare(object):
-         return result
- 
-     def _test_gid(self, cp):
--        return self.test.getGlyphID(self.test_cmap[cp], requireReal=True)
-+        return self.test.getGlyphID(self.test_cmap[cp])
- 
-     def _target_gid(self, cp):
--        return self.target.getGlyphID(self.target_cmap[cp], requireReal=True)
-+        return self.target.getGlyphID(self.target_cmap[cp])
- 
-     def _cp_error_msg(self, cp, test_msg, target_msg):
-         test_gid = self._test_gid(cp)
-diff --git a/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/noto_lint.py b/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/noto_lint.py
-index 4951832..4c902f1 100755
---- a/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/noto_lint.py
-+++ b/nototools-cd79db632c9a506ad61ae72bfad5875341ca56b8/nototools/noto_lint.py
-@@ -1380,7 +1380,7 @@ def check_font(
-         cmap = font_data.get_cmap(font)
-         for cp in lint_config.parse_int_ranges(WIN_ANSI_CODEPOINTS, True):
-             if cp in cmap:
--                tmp_gids.add(font.getGlyphID(cmap[cp], requireReal=True))
-+                tmp_gids.add(font.getGlyphID(cmap[cp]))
-         win_ansi_gids = frozenset(tmp_gids)
- 
-         font_ymin = None
-