From 2b97677c56802c73da8c7d2cfd12f4ecd091ff64d050c1d4af8e7a767f540366 Mon Sep 17 00:00:00 2001 From: Fuminobu Takeyama Date: Thu, 22 Sep 2016 05:47:12 +0000 Subject: [PATCH] Accepting request 429351 from home:ftake:branches:M17N:fonts fix boo#998301 OBS-URL: https://build.opensuse.org/request/show/429351 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/google-noto-fonts?expand=0&rev=28 --- 59-noto-sans-cjk.conf | 248 -------------------------------------- generate-specfile.sh | 6 +- google-noto-fonts.changes | 8 ++ google-noto-fonts.spec | 6 - google-noto-fonts.spec.in | 2 - 5 files changed, 9 insertions(+), 261 deletions(-) delete mode 100644 59-noto-sans-cjk.conf diff --git a/59-noto-sans-cjk.conf b/59-noto-sans-cjk.conf deleted file mode 100644 index a230493..0000000 --- a/59-noto-sans-cjk.conf +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - sans-serif - - - zh-cn - - - Noto Sans CJK SC - - - - - serif - - - zh-cn - - - Noto Sans CJK SC - - - - - monospace - - - zh-cn - - - Noto Sans Mono CJK SC - Noto Sans CJK SC - - - - - sans-serif - - - zh-sg - - - Noto Sans CJK SC - - - - - serif - - - zh-sg - - - Noto Sans CJK SC - - - - - monospace - - - zh-sg - - - Noto Sans Mono CJK SC - Noto Sans CJK SC - - - - - - sans-serif - - - zh-tw - - - Noto Sans CJK TC - - - - - serif - - - zh-tw - - - Noto Sans CJK TC - - - - - monospace - - - zh-tw - - - Noto Sans Mono CJK TC - Noto Sans CJK TC - - - - - sans-serif - - - zh-hk - - - Noto Sans CJK TC - - - - - serif - - - zh-hk - - - Noto Sans CJK TC - - - - - monospace - - - zh-hk - - - Noto Sans Mono CJK TC - Noto Sans CJK TC - - - - - sans-serif - - - zh-mo - - - Noto Sans CJK TC - - - - - serif - - - zh-mo - - - Noto Sans CJK TC - - - - - monospace - - - zh-mo - - - Noto Sans Mono CJK TC - Noto Sans CJK TC - - - - - - sans-serif - - - ko - - - Noto Sans CJK KR - - - - - serif - - - ko - - - Noto Sans CJK KR - - - - - monospace - - - ko - - - Noto Sans Mono CJK KR - Noto Sans CJK KR - - - - - - sans-serif - - - ja - - - Noto Sans CJK JP - - - - - serif - - - ja - - - Noto Sans CJK JP - - - - - monospace - - - ja - - - Noto Sans Mono CJK JP - Noto Sans CJK JP - - - diff --git a/generate-specfile.sh b/generate-specfile.sh index 17acc85..9962992 100644 --- a/generate-specfile.sh +++ b/generate-specfile.sh @@ -14,7 +14,7 @@ rm -f $pkg_name/NotoSans*CJK*.otf cp -f $pkg_name.spec.in $pkg_name.spec for h in hinted; do - ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::' | sort | uniq | while read font; do + ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::' | sort -f | uniq | while read font; do serif=`echo $font | sed 's:\(Sans\|Serif\).*:\1:'` ui=`(echo $font | grep -q UI) && echo UI` script=`echo $font | sed "s:$serif\(.*\)$ui:\1:"` @@ -72,10 +72,6 @@ for h in hinted; do sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec elif [ "$script" == "CJK" ]; then sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.ttc\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec - sed -i "s:@SUBPACKAGE_FILELISTS@:%dir %{_fontsconfdir}\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec - sed -i "s:@SUBPACKAGE_FILELISTS@:%dir %{_fontsconfddir}\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec - sed -i "s:@SUBPACKAGE_FILELISTS@:%files_fontsconf_availdir\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec - sed -i "s:@SUBPACKAGE_FILELISTS@:%files_fontsconf_file -l 59-noto-sans-cjk.conf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec else sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec fi diff --git a/google-noto-fonts.changes b/google-noto-fonts.changes index 8809633..7f5f499 100644 --- a/google-noto-fonts.changes +++ b/google-noto-fonts.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Sep 11 07:59:49 UTC 2016 - ftake@geeko.jp + +- move 59-noto-sans-cjk.conf into fonts-config (boo#998301) + to prevent an independent font package from changing family + preferences list +- Enable case-insensitive sort and regenerate the spec file + ------------------------------------------------------------------- Sun Apr 3 14:22:24 UTC 2016 - i@marguerite.su diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec index ecddb01..1f82243 100644 --- a/google-noto-fonts.spec +++ b/google-noto-fonts.spec @@ -33,7 +33,6 @@ Url: https://github.com/googlei18n/noto-fonts Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source1: https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip Source2: generate-specfile.sh -Source3: 59-noto-sans-cjk.conf BuildRequires: fontpackages-devel BuildRequires: unzip %reconfigure_fonts_prereq @@ -1377,7 +1376,6 @@ unzip -o %{S:1} mkdir -p %{buildroot}%{_ttfontsdir} cp *.ttf %{buildroot}%{_ttfontsdir}/ cp *.ttc %{buildroot}%{_ttfontsdir}/ -%install_fontsconf %{SOURCE3} %reconfigure_fonts_scriptlets -n noto-coloremoji-fonts @@ -1680,10 +1678,6 @@ cp *.ttc %{buildroot}%{_ttfontsdir}/ %defattr(0644,root,root,755) %dir %{_ttfontsdir} %{_ttfontsdir}/NotoSansCJK*.ttc -%dir %{_fontsconfdir} -%dir %{_fontsconfddir} -%files_fontsconf_availdir -%files_fontsconf_file -l 59-noto-sans-cjk.conf %files -n noto-sans-coptic-fonts %defattr(0644,root,root,755) diff --git a/google-noto-fonts.spec.in b/google-noto-fonts.spec.in index f336fa0..2e1889e 100644 --- a/google-noto-fonts.spec.in +++ b/google-noto-fonts.spec.in @@ -32,7 +32,6 @@ Url: https://github.com/googlei18n/noto-fonts Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source1: https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip Source2: generate-specfile.sh -Source3: 59-noto-sans-cjk.conf BuildRequires: fontpackages-devel BuildRequires: unzip %reconfigure_fonts_prereq @@ -65,7 +64,6 @@ unzip -o %{S:1} mkdir -p %{buildroot}%{_ttfontsdir} cp *.ttf %{buildroot}%{_ttfontsdir}/ cp *.ttc %{buildroot}%{_ttfontsdir}/ -%install_fontsconf %{SOURCE3} @SUBPACKAGE_SCRIPTLETS@