From 64e52cf23836782f3b1e7a21f6a3f4632804d9d3efcd3e5b23d15fd37db4cf36 Mon Sep 17 00:00:00 2001 From: Fuminobu Takeyama Date: Sat, 10 Oct 2015 07:00:24 +0000 Subject: [PATCH] Accepting request 337278 from home:fcrozat:branches:M17N:fonts - Update to version 2015102: + All fonts are now under OFL-1.1 license + New variants: Emoji, Nastaliq Urdu, Mono CJK - Adapt generate-specfile.sh and template to not fail if there is no draft font. OBS-URL: https://build.opensuse.org/request/show/337278 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/google-noto-fonts?expand=0&rev=14 --- Noto-hinted.zip | 4 +- generate-specfile.sh | 2 +- google-noto-fonts.changes | 9 ++++ google-noto-fonts.spec | 106 ++++++++++++++++++++++++++++++++++++-- google-noto-fonts.spec.in | 10 ++-- 5 files changed, 120 insertions(+), 11 deletions(-) diff --git a/Noto-hinted.zip b/Noto-hinted.zip index 30951b3..ae3768c 100644 --- a/Noto-hinted.zip +++ b/Noto-hinted.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:718d87249d90a5c1db9fcaef635bc4e98fbd112519703dece3c09ebb6c88624e -size 380364279 +oid sha256:b3ae9a9761b4f376a48a05422a6c897af9cd03ca3dc4750c85ebd90c56329a91 +size 491690381 diff --git a/generate-specfile.sh b/generate-specfile.sh index 6baae2f..91b4b66 100644 --- a/generate-specfile.sh +++ b/generate-specfile.sh @@ -8,7 +8,7 @@ done rm $pkg_name/LICENSE*.txt # remove draft fonts for now -rm $pkg_name/*Draft.*tf +rm -f $pkg_name/*Draft.*tf cp -f $pkg_name.spec.in $pkg_name.spec for h in hinted; do diff --git a/google-noto-fonts.changes b/google-noto-fonts.changes index 2ac30ae..88fecc2 100644 --- a/google-noto-fonts.changes +++ b/google-noto-fonts.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 8 14:11:43 UTC 2015 - fcrozat@suse.com + +- Update to version 2015102: + + All fonts are now under OFL-1.1 license + + New variants: Emoji, Nastaliq Urdu, Mono CJK +- Adapt generate-specfile.sh and template to not fail if there is + no draft font. + ------------------------------------------------------------------- Wed Aug 26 09:49:02 UTC 2015 - fcrozat@suse.com diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec index 29fddbf..1d412a8 100644 --- a/google-noto-fonts.spec +++ b/google-noto-fonts.spec @@ -17,15 +17,17 @@ %define hyear 2015 -%define hmonth 06 -%define hday 18 +%define hmonth 10 +%define hday 02 %define src_name NotoFonts +# DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-specfile.sh scriptZZ + Name: google-noto-fonts Version: %{hyear}%{hmonth}%{hday} Release: 0 Summary: Noto Font Families -License: Apache-2.0 +License: OFL-1.1 Group: System/X11/Fonts Url: https://github.com/googlei18n/noto-fonts Source0: http://www.google.com/get/noto/pkgs/Noto-hinted.zip @@ -40,6 +42,16 @@ BuildArch: noarch Noto's design goal is to achieve visual harmonization (e.g., compatible heights and stroke thicknesses) across languages. +%package -n noto-emoji +Summary: Noto Font +Group: System/X11/Fonts +Requires: google-noto-fonts + +%description -n noto-emoji +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains + font, hinted. + %package -n noto-kufiarabic Summary: Noto Font Group: System/X11/Fonts @@ -60,6 +72,16 @@ Noto's design goal is to achieve visual harmonization (e.g., compatible heights and stroke thicknesses) across languages. This package contains font, hinted. +%package -n noto-nastaliqurdu +Summary: Noto Font +Group: System/X11/Fonts +Requires: google-noto-fonts + +%description -n noto-nastaliqurdu +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains + font, hinted. + %package -n noto-sans Summary: Noto Sans Serif Font Group: System/X11/Fonts @@ -580,6 +602,46 @@ Noto's design goal is to achieve visual harmonization (e.g., compatible heights and stroke thicknesses) across languages. This package contains Mongolian Sans Serif font, hinted. +%package -n noto-sans-monocjkjp +Summary: Noto Mono CJKjp Sans Serif Font +Group: System/X11/Fonts +Requires: google-noto-fonts + +%description -n noto-sans-monocjkjp +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains +MonoCJKjp Sans Serif font, hinted. + +%package -n noto-sans-monocjkkr +Summary: Noto Mono CJKkr Sans Serif Font +Group: System/X11/Fonts +Requires: google-noto-fonts + +%description -n noto-sans-monocjkkr +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains +MonoCJKkr Sans Serif font, hinted. + +%package -n noto-sans-monocjksc +Summary: Noto Mono CJKsc Sans Serif Font +Group: System/X11/Fonts +Requires: google-noto-fonts + +%description -n noto-sans-monocjksc +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains +MonoCJKsc Sans Serif font, hinted. + +%package -n noto-sans-monocjktc +Summary: Noto Mono CJKtc Sans Serif Font +Group: System/X11/Fonts +Requires: google-noto-fonts + +%description -n noto-sans-monocjktc +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains +MonoCJKtc Sans Serif font, hinted. + %package -n noto-sans-myanmar Summary: Noto Myanmar Sans Serif Font Group: System/X11/Fonts @@ -1034,7 +1096,7 @@ Thai Sans Serif font, hinted. %prep %setup -q -c -n %{name}-%{version} -rm *Draft.*tf +rm -f *Draft.*tf %build @@ -1043,10 +1105,14 @@ mkdir -p %{buildroot}%{_ttfontsdir} cp *.ttf %{buildroot}%{_ttfontsdir}/ cp *.otf %{buildroot}%{_ttfontsdir}/ +%reconfigure_fonts_scriptlets -n noto-emoji + %reconfigure_fonts_scriptlets -n noto-kufiarabic %reconfigure_fonts_scriptlets -n noto-naskharabic +%reconfigure_fonts_scriptlets -n noto-nastaliqurdu + %reconfigure_fonts_scriptlets -n noto-sans %reconfigure_fonts_scriptlets -n noto-sans-armenian @@ -1151,6 +1217,14 @@ cp *.otf %{buildroot}%{_ttfontsdir}/ %reconfigure_fonts_scriptlets -n noto-sans-mongolian +%reconfigure_fonts_scriptlets -n noto-sans-monocjkjp + +%reconfigure_fonts_scriptlets -n noto-sans-monocjkkr + +%reconfigure_fonts_scriptlets -n noto-sans-monocjksc + +%reconfigure_fonts_scriptlets -n noto-sans-monocjktc + %reconfigure_fonts_scriptlets -n noto-sans-myanmar %reconfigure_fonts_scriptlets -n noto-sans-newtailue @@ -1246,6 +1320,10 @@ cp *.otf %{buildroot}%{_ttfontsdir}/ %doc LICENSE*.txt %dir %{_ttfontsdir} +%files -n noto-emoji +%defattr(-,root,root) +%{_ttfontsdir}/NotoEmoji-*.?tf + %files -n noto-kufiarabic %defattr(-,root,root) %{_ttfontsdir}/NotoKufiArabic-*.?tf @@ -1254,6 +1332,10 @@ cp *.otf %{buildroot}%{_ttfontsdir}/ %defattr(-,root,root) %{_ttfontsdir}/NotoNaskhArabic-*.?tf +%files -n noto-nastaliqurdu +%defattr(-,root,root) +%{_ttfontsdir}/NotoNastaliqUrdu-*.?tf + %files -n noto-sans %defattr(-,root,root) %{_ttfontsdir}/NotoSans-*.?tf @@ -1462,6 +1544,22 @@ cp *.otf %{buildroot}%{_ttfontsdir}/ %defattr(-,root,root) %{_ttfontsdir}/NotoSansMongolian-*.?tf +%files -n noto-sans-monocjkjp +%defattr(-,root,root) +%{_ttfontsdir}/NotoSansMonoCJKjp-*.?tf + +%files -n noto-sans-monocjkkr +%defattr(-,root,root) +%{_ttfontsdir}/NotoSansMonoCJKkr-*.?tf + +%files -n noto-sans-monocjksc +%defattr(-,root,root) +%{_ttfontsdir}/NotoSansMonoCJKsc-*.?tf + +%files -n noto-sans-monocjktc +%defattr(-,root,root) +%{_ttfontsdir}/NotoSansMonoCJKtc-*.?tf + %files -n noto-sans-myanmar %defattr(-,root,root) %{_ttfontsdir}/NotoSansMyanmar-*.?tf diff --git a/google-noto-fonts.spec.in b/google-noto-fonts.spec.in index f321947..ac04d62 100644 --- a/google-noto-fonts.spec.in +++ b/google-noto-fonts.spec.in @@ -16,15 +16,17 @@ # %define hyear 2015 -%define hmonth 06 -%define hday 18 +%define hmonth 10 +%define hday 02 %define src_name NotoFonts +# DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-specfile.sh scriptZZ + Name: google-noto-fonts Version: %{hyear}%{hmonth}%{hday} Release: 0 Summary: Noto Font Families -License: Apache-2.0 +License: OFL-1.1 Group: System/X11/Fonts Url: https://github.com/googlei18n/noto-fonts Source0: http://www.google.com/get/noto/pkgs/Noto-hinted.zip @@ -43,7 +45,7 @@ thicknesses) across languages. %prep %setup -q -c -n %{name}-%{version} -rm *Draft.*tf +rm -f *Draft.*tf %build