forked from pool/google-noto-fonts
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
This commit is contained in:
Fuminobu Takeyama
Git OBS Bridge
parent
bdf5eea428
commit
2b97677c56
@ -1,248 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
|
||||||
<!-- Noto Sans CJK Configure File -->
|
|
||||||
<fontconfig>
|
|
||||||
<!-- modified by i@marguerite.su-->
|
|
||||||
<!-- 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>sans-serif</string>
|
|
||||||
</test>
|
|
||||||
<test name="lang" compare="eq">
|
|
||||||
<string>ja</string>
|
|
||||||
</test>
|
|
||||||
<edit name="family" mode="prepend">
|
|
||||||
<string>Noto Sans CJK JP</string>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="pattern">
|
|
||||||
<test qual="any" name="family" compare="eq">
|
|
||||||
<string>serif</string>
|
|
||||||
</test>
|
|
||||||
<test name="lang" compare="eq">
|
|
||||||
<string>ja</string>
|
|
||||||
</test>
|
|
||||||
<edit name="family" mode="prepend">
|
|
||||||
<string>Noto Sans CJK JP</string>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<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>
|
|
||||||
@ -14,7 +14,7 @@ rm -f $pkg_name/NotoSans*CJK*.otf
|
|||||||
|
|
||||||
cp -f $pkg_name.spec.in $pkg_name.spec
|
cp -f $pkg_name.spec.in $pkg_name.spec
|
||||||
for h in hinted; do
|
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:'`
|
serif=`echo $font | sed 's:\(Sans\|Serif\).*:\1:'`
|
||||||
ui=`(echo $font | grep -q UI) && echo UI`
|
ui=`(echo $font | grep -q UI) && echo UI`
|
||||||
script=`echo $font | sed "s:$serif\(.*\)$ui:\1:"`
|
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
|
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 59-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
|
||||||
|
|||||||
@ -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
|
Sun Apr 3 14:22:24 UTC 2016 - i@marguerite.su
|
||||||
|
|
||||||
|
|||||||
@ -33,7 +33,6 @@ 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: 59-noto-sans-cjk.conf
|
|
||||||
BuildRequires: fontpackages-devel
|
BuildRequires: fontpackages-devel
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
%reconfigure_fonts_prereq
|
%reconfigure_fonts_prereq
|
||||||
@ -1377,7 +1376,6 @@ 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
|
||||||
|
|
||||||
@ -1680,10 +1678,6 @@ 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 59-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)
|
||||||
|
|||||||
@ -32,7 +32,6 @@ 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: 59-noto-sans-cjk.conf
|
|
||||||
BuildRequires: fontpackages-devel
|
BuildRequires: fontpackages-devel
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
%reconfigure_fonts_prereq
|
%reconfigure_fonts_prereq
|
||||||
@ -65,7 +64,6 @@ 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@
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user