!2 remove ethiopic TTF fonts

Merge pull request !2 from sugarfillet/master
This commit is contained in:
openeuler-ci-bot 2020-01-19 19:18:17 +08:00 committed by Gitee
commit e65b120daf

View File

@ -4,7 +4,7 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
Version: 7.5
Release: 22
Release: 23
License: MIT and Lucida and Public Domain
URL: http://www.x.org
@ -75,8 +75,8 @@ Contains a set of 100dpi fonts in the ISO8859-15 encoding which provide Euro sup
%package others
Summary: Other X.Org X11 fonts
Requires(post): fontconfig mkfontdir mkfontscale ttmkfdir
Requires(postun): fontconfig mkfontdir mkfontscale ttmkfdir
Requires(post): fontconfig mkfontdir mkfontscale
Requires(postun): fontconfig mkfontdir mkfontscale
Obsoletes: xorg-x11-fonts-cyrillic
Obsoletes: xorg-x11-fonts-ethiopic
@ -90,7 +90,6 @@ Obsoletes: xorg-x11-fonts-ISO8859-9-75dpi
Obsoletes: xorg-x11-fonts-ISO8859-9-100dpi
Provides: xorg-x11-fonts-cyrillic
Provides: xorg-x11-fonts-ethiopic
Provides: xorg-x11-fonts-Type1
Provides: xorg-x11-fonts-ISO8859-14-75dpi
Provides: xorg-x11-fonts-ISO8859-14-100dpi
@ -197,7 +196,6 @@ done
%post others
{
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_x11fontdir}/TTF
xorg-x11-fonts-update-dirs %{_x11fontdir}/OTF
xorg-x11-fonts-update-dirs %{_x11fontdir}/Type1
mkfontdir %{_x11fontdir}/75dpi
@ -207,10 +205,6 @@ done
%postun others
{
FONTDIR=%{_x11fontdir}/TTF
if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir $FONTDIR
fi
FONTDIR=%{_x11fontdir}/OTF
if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs $FONTDIR
@ -360,15 +354,15 @@ done
%{_x11fontdir}/100dpi/lut[BR]S??-ISO8859-15.pcf*
%files others
%{_catalogue}/xorg-x11-fonts-TTF
%exclude %{_catalogue}/xorg-x11-fonts-TTF
%{_catalogue}/xorg-x11-fonts-OTF
%dir %{_x11fontdir}/TTF
%{_x11fontdir}/TTF/GohaTibebZemen.ttf
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/encodings.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.scale
%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.cache-*
%exclude %dir %{_x11fontdir}/TTF
%exclude %{_x11fontdir}/TTF/GohaTibebZemen.ttf
%exclude %{_x11fontdir}/TTF/encodings.dir
%exclude %{_x11fontdir}/TTF/fonts.dir
%exclude %{_x11fontdir}/TTF/fonts.alias
%exclude %{_x11fontdir}/TTF/fonts.scale
%exclude %{_x11fontdir}/TTF/fonts.cache-*
%dir %{_x11fontdir}/OTF
%{_x11fontdir}/OTF/GohaTibebZemen.otf
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/encodings.dir
@ -541,6 +535,12 @@ done
%{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf*
%changelog
* Thu Jan 16 2020 Shuaishuai Song <songshuaishuai2@openeuler.org> - 7.5-23
- Type:enhancement
- Id:NA
- SUG:NA
- DESC: remove ethiopic TTF fonts
* Thu Jan 09 2020 openEuler Buildteam <buildteam@openeuler.org> - 7.5-22
- Type:enhancement
- Id:NA