1
0
Dominique Leuenberger 2016-03-29 07:52:04 +00:00 committed by Git OBS Bridge
commit 7ca4a4c4b8
5 changed files with 297 additions and 11 deletions

246
52-noto-sans-cjk.conf Normal file
View File

@ -0,0 +1,246 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- Noto Sans CJK Configure File -->
<fontconfig>
<!-- modified by i@marguerite.su-->
<match target="font">
<test qual="any" name="family" compare="contains">
<string>Noto Sans CJK</string>
</test>
<test qual="any" name="family" compare="contains">
<string>Noto Sans Mono CJK</string>
</test>
<edit name="lcdfilter">
<const>lcdlight</const>
</edit>
<edit name="hintstyle">
<const>hintslight</const>
</edit>
<edit name="rgba">
<const>vrgb</const>
</edit>
<edit name="weight">
<const>regular</const>
</edit>
</match>
<!-- Simplified Chinese -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-cn</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-cn</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-cn</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK SC</string>
<string>Noto Sans CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-sg</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-sg</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-sg</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK SC</string>
<string>Noto Sans CJK SC</string>
</edit>
</match>
<!-- Traditional Chinese -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-tw</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-tw</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-tw</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK TC</string>
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-hk</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-hk</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-hk</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK TC</string>
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-mo</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-mo</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-mo</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK TC</string>
<string>Noto Sans CJK TC</string>
</edit>
</match>
<!-- Korean -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>ko</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK KR</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>ko</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK KR</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>ko</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK KR</string>
<string>Noto Sans CJK KR</string>
</edit>
</match>
<!-- Japanese -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>ja</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK JP</string>
<string>Noto Sans CJK JP</string>
</edit>
</match>
</fontconfig>

View File

@ -34,6 +34,9 @@ for h in hinted; do
for l in jp kr sc tc ; do for l in jp kr sc tc ; do
obsoletes="$obsoletes noto-sans-cjk$l noto-sans-cjk$l-fonts " obsoletes="$obsoletes noto-sans-cjk$l noto-sans-cjk$l-fonts "
done done
for j in zh-CN zh-SG zh-TW zh-HK zh-MO ja ko ; do
scalables="$scalables scalable-font-$j"
done
fi fi
packagename="$packagename-fonts" packagename="$packagename-fonts"
summary=`echo "Noto $script $serif_dsc Font" | sed 's:\([a-z]\)\([A-Z]\):\1 \2:'` summary=`echo "Noto $script $serif_dsc Font" | sed 's:\([a-z]\)\([A-Z]\):\1 \2:'`
@ -42,8 +45,16 @@ for h in hinted; do
sed -i "s/@SUBPACKAGE_HEADERS@/Summary: $summary\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/Summary: $summary\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
sed -i "s;@SUBPACKAGE_HEADERS@;Group: System/X11/Fonts\n@SUBPACKAGE_HEADERS@;" $pkg_name.spec sed -i "s;@SUBPACKAGE_HEADERS@;Group: System/X11/Fonts\n@SUBPACKAGE_HEADERS@;" $pkg_name.spec
sed -i "s/@SUBPACKAGE_HEADERS@/Requires: $pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/Requires: $pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes: $obsoletes\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec for i in $obsoletes ; do
sed -i "s/@SUBPACKAGE_HEADERS@/Provides: $obsoletes\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes: $i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
sed -i "s/@SUBPACKAGE_HEADERS@/Provides: $i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
done
if [ "$script" == "CJK" ]; then
for i in $scalables ; do
sed -i "s/@SUBPACKAGE_HEADERS@/Provides: $i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
done
sed -i "s/@SUBPACKAGE_HEADERS@/Provides: locale(zh_CN;zh_SG;zh_TW;zh_HK;zh_MO)\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
fi
sed -i "s/@SUBPACKAGE_HEADERS@/%reconfigure_fonts_prereq\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/%reconfigure_fonts_prereq\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
sed -i "s/@SUBPACKAGE_HEADERS@/\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
sed -i "s/@SUBPACKAGE_HEADERS@/%description -n $packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/%description -n $packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
@ -61,6 +72,10 @@ for h in hinted; do
sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
elif [ "$script" == "CJK" ]; then 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@:%{_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 52-noto-sans-cjk.conf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
else else
sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
fi fi

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Mar 25 11:23:25 UTC 2016 - i@marguerite.su
- add 52-noto-sans-cjk.conf, fix boo#972664 "Noto Sans CJK:
Chinese are using Japanese Glyphs".
- add scalable-font-XXX provides to noto-sans-cjk-fonts package
- add locale() to noto-sans-cjk-fonts package, set it as default
font for Chinese.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 9 14:22:02 UTC 2016 - fcrozat@suse.com Wed Mar 9 14:22:02 UTC 2016 - fcrozat@suse.com

View File

@ -33,6 +33,7 @@ Url: https://github.com/googlei18n/noto-fonts
Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip
Source1: https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip Source1: https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip
Source2: generate-specfile.sh Source2: generate-specfile.sh
Source3: 52-noto-sans-cjk.conf
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
BuildRequires: unzip BuildRequires: unzip
%reconfigure_fonts_prereq %reconfigure_fonts_prereq
@ -302,23 +303,31 @@ Summary: Noto CJK Sans Serif Font
Group: System/X11/Fonts Group: System/X11/Fonts
Requires: google-noto-fonts-doc Requires: google-noto-fonts-doc
Obsoletes: noto-sans-cjk Obsoletes: noto-sans-cjk
Obsoletes: noto-sans-cjkjp
Obsoletes: noto-sans-cjkjp-fonts
Obsoletes: noto-sans-cjkkr
Obsoletes: noto-sans-cjkkr-fonts
Obsoletes: noto-sans-cjksc
Obsoletes: noto-sans-cjksc-fonts
Obsoletes: noto-sans-cjktc
Obsoletes: noto-sans-cjktc-fonts
Provides: noto-sans-cjk Provides: noto-sans-cjk
Obsoletes: noto-sans-cjkjp
Provides: noto-sans-cjkjp Provides: noto-sans-cjkjp
Obsoletes: noto-sans-cjkjp-fonts
Provides: noto-sans-cjkjp-fonts Provides: noto-sans-cjkjp-fonts
Obsoletes: noto-sans-cjkkr
Provides: noto-sans-cjkkr Provides: noto-sans-cjkkr
Obsoletes: noto-sans-cjkkr-fonts
Provides: noto-sans-cjkkr-fonts Provides: noto-sans-cjkkr-fonts
Obsoletes: noto-sans-cjksc
Provides: noto-sans-cjksc Provides: noto-sans-cjksc
Obsoletes: noto-sans-cjksc-fonts
Provides: noto-sans-cjksc-fonts Provides: noto-sans-cjksc-fonts
Obsoletes: noto-sans-cjktc
Provides: noto-sans-cjktc Provides: noto-sans-cjktc
Obsoletes: noto-sans-cjktc-fonts
Provides: noto-sans-cjktc-fonts Provides: noto-sans-cjktc-fonts
Provides: scalable-font-ja
Provides: scalable-font-ko
Provides: scalable-font-zh-CN
Provides: scalable-font-zh-HK
Provides: scalable-font-zh-MO
Provides: scalable-font-zh-SG
Provides: scalable-font-zh-TW
Provides: locale(zh_CN;zh_SG;zh_TW;zh_HK;zh_MO)
%reconfigure_fonts_prereq %reconfigure_fonts_prereq
%description -n noto-sans-cjk-fonts %description -n noto-sans-cjk-fonts
@ -1368,6 +1377,7 @@ unzip -o %{S:1}
mkdir -p %{buildroot}%{_ttfontsdir} mkdir -p %{buildroot}%{_ttfontsdir}
cp *.ttf %{buildroot}%{_ttfontsdir}/ cp *.ttf %{buildroot}%{_ttfontsdir}/
cp *.ttc %{buildroot}%{_ttfontsdir}/ cp *.ttc %{buildroot}%{_ttfontsdir}/
%install_fontsconf %{SOURCE3}
%reconfigure_fonts_scriptlets -n noto-coloremoji-fonts %reconfigure_fonts_scriptlets -n noto-coloremoji-fonts
@ -1670,6 +1680,10 @@ cp *.ttc %{buildroot}%{_ttfontsdir}/
%defattr(0644,root,root,755) %defattr(0644,root,root,755)
%dir %{_ttfontsdir} %dir %{_ttfontsdir}
%{_ttfontsdir}/NotoSansCJK*.ttc %{_ttfontsdir}/NotoSansCJK*.ttc
%dir %{_fontsconfdir}
%dir %{_fontsconfddir}
%files_fontsconf_availdir
%files_fontsconf_file -l 52-noto-sans-cjk.conf
%files -n noto-sans-coptic-fonts %files -n noto-sans-coptic-fonts
%defattr(0644,root,root,755) %defattr(0644,root,root,755)

View File

@ -1,7 +1,7 @@
# #
# spec file for package google-noto-fonts # spec file for package google-noto-fonts
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,7 @@ Url: https://github.com/googlei18n/noto-fonts
Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip
Source1: https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip Source1: https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip
Source2: generate-specfile.sh Source2: generate-specfile.sh
Source3: 52-noto-sans-cjk.conf
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
BuildRequires: unzip BuildRequires: unzip
%reconfigure_fonts_prereq %reconfigure_fonts_prereq
@ -64,6 +65,7 @@ unzip -o %{S:1}
mkdir -p %{buildroot}%{_ttfontsdir} mkdir -p %{buildroot}%{_ttfontsdir}
cp *.ttf %{buildroot}%{_ttfontsdir}/ cp *.ttf %{buildroot}%{_ttfontsdir}/
cp *.ttc %{buildroot}%{_ttfontsdir}/ cp *.ttc %{buildroot}%{_ttfontsdir}/
%install_fontsconf %{SOURCE3}
@SUBPACKAGE_SCRIPTLETS@ @SUBPACKAGE_SCRIPTLETS@