update code

google-noto-cjk-fonts.spec

@@ -1,21 +1,20 @@
-%global commit0 32a5844539f2e348ed36b44e990f9b06d7fb89fe
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 %global fontname google-noto-cjk
 %global fontconf google-noto
 
+%global commit0 32a5844539f2e348ed36b44e990f9b06d7fb89fe
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
 %global common_desc \
-Noto CJK fonts, supporting Simplified Chinese, Traditional Chinese, \
+Noto Sans CJK comprehensively cover Simplified Chinese,Traditional Chinese, \
-Japanese, and Korean. The supported scripts are Han, Hiragana, Katakana, \
+Japanese, and Korean in a unified font family. This includes the full coverage of CJK Ideographs \
-Hangul, and Bopomofo. Latin, Greek, Cyrllic, and various symbols are also \
+with variation support for 4 regions, Kangxi radicals, Japanese Kana, Korean Hangul, and other CJK \
-supported for compatibility with CJK standards. \
+symbols and letters in the Basic Multilingual Plane of Unicode. \
 %{nil}
 
 Name:           google-noto-cjk-fonts
 Version:        20170602
-Release:        8%{?dist}
+Release:        9
 Summary:        Google Noto Sans CJK Fonts
-
 License:        OFL
 URL:            https://github.com/googlei18n/noto-cjk
 Source0:        https://github.com/googlei18n/noto-cjk/archive/%{commit0}.tar.gz#/noto-cjk-%{shortcommit0}.tar.gz
@@ -23,53 +22,16 @@ Source1:        genfontconf.py
 Source2:        genfontconf.sh
 
 BuildArch:      noarch
-BuildRequires:  fontpackages-devel
+BuildRequires:  fontpackages-devel python3 /usr/bin/xmllint
-BuildRequires:  python3
+Requires:       fontpackages-filesystem google-noto-sans-cjk-ttc-fonts google-noto-serif-cjk-ttc-fonts
-BuildRequires:  /usr/bin/xmllint
-Requires:       fontpackages-filesystem
-Requires:       google-noto-sans-cjk-ttc-fonts
-Requires:       google-noto-serif-cjk-ttc-fonts
-
-%if 0%{?fedora}
-
-Obsoletes:      google-noto-sans-cjk-fonts < 20150617
-Provides:       google-noto-sans-cjk-fonts = 20150617
-
-# notocjkrep Package Name
-%define notocjkrep(:)\
-%define pname %(echo %{*} | tr "A-Z " "a-z-")\
-Obsoletes:      google-noto-%{pname}-fonts < 20150617\
-Provides:       google-noto-%{pname}-fonts = 20150617\
-Obsoletes:      google-noto-cjk-%{pname}-fonts < %{version}-%{release}\
-Provides:       google-noto-cjk-%{pname}-fonts = %{version}-%{release}\
-
-
-%notocjkrep Sans Simplified Chinese
-%notocjkrep Sans Traditional Chinese
-%notocjkrep Sans Japanese
-%notocjkrep Sans Korean
-
-%endif
 
+Obsoletes:      google-noto-cjk-fonts-common
+Provides:       google-noto-cjk-fonts-common
 
 %description
 %common_desc
 
-%package common
-Summary:        Common files for Noto CJK fonts
-
-%description common
-%common_desc
-
-Common files for Google Noto CJK fonts.
-
-
-# notocjkpkg [-n sub-package-name] [-f font-file] [-p priority] Font Name
-# -n sub package name
-# -f font file name
-# -p overrides fontconfig .conf priority (default 66)
 %define notocjkpkg(n:f:p:) \
-# override _font_pkg_name to avoid name changes in _font_pkg \
 %define _font_pkg_name() %1 \
 %define subpkgname %{-n:%{-n*}} \
 %define fontfiles %{-f:%{-f*}}\
@@ -86,100 +48,72 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \
 %_font_pkg -n google-noto-%subpkgname-fonts -f %{fconf} %fontfiles \
 %{nil}
 
-
 %notocjkpkg -n sans-cjk-ttc -f NotoSansCJK-*.ttc -p 65-0 Sans OTC
 
-
 %notocjkpkg -n serif-cjk-ttc -f NotoSerifCJK-*.ttc -p 65-0 Serif OTC
 
-
 %notocjkpkg -n sans-cjk-jp -f NotoSansCJKjp-*.otf Japanese Multilingual Sans OTF
 
-
 %notocjkpkg -n serif-cjk-jp -f NotoSerifCJKjp-*.otf Japanese Multilingual Serif OTF
 
-
 %notocjkpkg -n sans-mono-cjk-jp -f NotoSansMonoCJKjp-*.otf Japanese Multilingual Sans Mono OTF
 
-
 %notocjkpkg -n sans-cjk-kr -f NotoSansCJKkr-*.otf Korean Multilingual Sans OTF
 
-
 %notocjkpkg -n serif-cjk-kr -f NotoSerifCJKkr-*.otf Korean Multilingual Serif OTF
 
-
 %notocjkpkg -n sans-mono-cjk-kr -f NotoSansMonoCJKkr-*.otf Korean Multilingual Sans Mono OTF
 
-
 %notocjkpkg -n sans-cjk-sc -f NotoSansCJKsc-*.otf Simplified Chinese Multilingual Sans OTF
 
-
 %notocjkpkg -n serif-cjk-sc -f NotoSerifCJKsc-*.otf Simplified Chinese Multilingual Serif OTF
 
-
 %notocjkpkg -n sans-mono-cjk-sc -f NotoSansMonoCJKsc-*.otf Simplified Chinese Multilingual Sans Mono OTF
 
-
 %notocjkpkg -n sans-cjk-tc -f NotoSansCJKtc-*.otf Traditional Chinese Multilingual Sans OTF
 
-
 %notocjkpkg -n serif-cjk-tc -f NotoSerifCJKtc-*.otf Traditional Chinese Multilingual Serif OTF
 
-
 %notocjkpkg -n sans-mono-cjk-tc -f NotoSansMonoCJKtc-*.otf Traditional Chinese Multilingual Sans Mono OTF
 
-
 %notocjkpkg -n sans-jp -f NotoSansJP-*.otf Japanese Region-specific Sans OTF
 
-
 %notocjkpkg -n serif-jp -f NotoSerifJP-*.otf Japanese Region-specific Serif OTF
 
-
 %notocjkpkg -n sans-kr -f NotoSansKR-*.otf Korean Region-specific Sans OTF
 
-
 %notocjkpkg -n serif-kr -f NotoSerifKR-*.otf Korean Region-specific Serif OTF
 
-
 %notocjkpkg -n sans-sc -f NotoSansSC-*.otf Simplified Chinese Region-specific Sans OTF
 
-
 %notocjkpkg -n serif-sc -f NotoSerifSC-*.otf Simplified Chinese Region-specific Serif OTF
 
-
 %notocjkpkg -n sans-tc -f NotoSansTC-*.otf Traditional Chinese Region-specific Sans OTF
 
-
 %notocjkpkg -n serif-tc -f NotoSerifTC-*.otf Traditional Chinese Region-specific Serif OTF
 
+%package_help
 
 %prep
-%setup -q -n noto-cjk-%{commit0}
+%autosetup -n noto-cjk-%{commit0}
 cp -p %{SOURCE1} %{SOURCE2} .
-# generate the font conf files
 bash -x ./genfontconf.sh
 
-
 %build
 
-
 %install
 install -m 0755 -d %{buildroot}%{_fontdir}
 
-# copy OTC files
 install -m 0644 -p NotoSansCJK-*.ttc %{buildroot}%{_fontdir}
 install -m 0644 -p NotoSerifCJK-*.ttc %{buildroot}%{_fontdir}
 
-# copy Multilingual OTF files
 install -m 0644 -p NotoSansCJK{jp,kr,sc,tc}-*.otf %{buildroot}%{_fontdir}
 install -m 0644 -p NotoSerifCJK{jp,kr,sc,tc}-*.otf %{buildroot}%{_fontdir}
 install -m 0644 -p NotoSansMonoCJK{jp,kr,sc,tc}-*.otf %{buildroot}%{_fontdir}
 
-# copy Region-specific OTF
 install -m 0644 -p NotoSans{JP,KR,SC,TC}-*.otf %{buildroot}%{_fontdir}
 install -m 0644 -p NotoSerif{JP,KR,SC,TC}-*.otf %{buildroot}%{_fontdir}
 
-
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
             %{buildroot}%{_fontconfig_confdir}
 
@@ -207,59 +141,14 @@ do
 done
 
 %files
-
+%defattr(-,root,root)
-
-%files common
-%doc NEWS HISTORY README.formats README.third_party
 %license LICENSE
 
+%files help
+%defattr(-,root,root)
+%doc NEWS HISTORY README.formats README.third_party
 
 %changelog
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170602-8
+* Sat Oct 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 20170602-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Package init
 
-* Mon Apr 16 2018 Peng Wu <pwu@redhat.com> - 20170602-7
-- Make Noto CJK OTC files as default CJK fonts
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170602-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 22 2018 Akira TAGOH <tagoh@redhat.com> - 20170602-5
-- Update the priority to change the default font to Noto.
-
-* Mon Dec 11 2017 Peng Wu <pwu@redhat.com> - 20170602-4
-- Simplify spec file
-
-* Thu Dec  7 2017 Peng Wu <pwu@redhat.com> - 20170602-3
-- Include more fonts and sub package fonts
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170602-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jun  7 2017 Peng Wu <pwu@redhat.com> - 20170602-1
-- Include Serif fonts
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.004-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Dec  2 2016 Peng Wu <pwu@redhat.com> - 1.004-7
-- Rebuilt to fixes the spec file
-
-* Fri Dec  2 2016 Peng Wu <pwu@redhat.com> - 1.004-6
-- Disable Obsoletes for epel: for google-noto-sans-cjk-fonts (rh#1396260)
-- Disable notocjkrep macro definition for epel
-
-* Fri Apr 29 2016 Peng Wu <pwu@redhat.com> - 1.004-5
-- Replace google-noto-sans-cjk-fonts package
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.004-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Nov 13 2015 Peng Wu <pwu@redhat.com> - 1.004-3
-- Use TTC Files
-
-* Mon Oct 26 2015 Peng Wu <pwu@redhat.com> - 1.004-2
-- Fixes Spec
-
-* Mon Oct 26 2015 Peng Wu <pwu@redhat.com> - 1.004-1
-- Initial Version