From 07a1369c7fe1515d3269b089c0a448310ac4e185 Mon Sep 17 00:00:00 2001
From: zhanglu <zhanglu37@huawei.com>
Date: Thu, 6 Feb 2020 22:40:52 +0800
Subject: [PATCH 1/2] remove OTF fonts

---
 xorg-x11-fonts.spec | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 58eb043..5e3ab53 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -4,7 +4,7 @@
 Summary:    X.Org X11 fonts
 Name:       xorg-x11-fonts
 Version:    7.5
-Release:    23
+Release:    24
 License:    MIT and Lucida and Public Domain
 URL:        http://www.x.org
 
@@ -196,7 +196,6 @@ done
 
 %post others
 {
-  xorg-x11-fonts-update-dirs %{_x11fontdir}/OTF
   xorg-x11-fonts-update-dirs %{_x11fontdir}/Type1
   mkfontdir %{_x11fontdir}/75dpi
   mkfontdir %{_x11fontdir}/100dpi
@@ -205,10 +204,6 @@ done
 
 %postun others
 {
-  FONTDIR=%{_x11fontdir}/OTF
-  if [ "$1" = "0" -a -d $FONTDIR ]; then
-    xorg-x11-fonts-update-dirs $FONTDIR
-  fi
   FONTDIR=%{_x11fontdir}/Type1
   if [ "$1" = "0" -a -d $FONTDIR ]; then
     xorg-x11-fonts-update-dirs $FONTDIR
@@ -355,7 +350,7 @@ done
 
 %files others
 %exclude %{_catalogue}/xorg-x11-fonts-TTF
-%{_catalogue}/xorg-x11-fonts-OTF
+%exclude %{_catalogue}/xorg-x11-fonts-OTF
 %exclude %dir %{_x11fontdir}/TTF
 %exclude %{_x11fontdir}/TTF/GohaTibebZemen.ttf
 %exclude %{_x11fontdir}/TTF/encodings.dir
@@ -363,13 +358,13 @@ done
 %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
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.alias
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.scale
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.cache-*
+%exclude %dir %{_x11fontdir}/OTF
+%exclude %{_x11fontdir}/OTF/GohaTibebZemen.otf
+%exclude %{_x11fontdir}/OTF/encodings.dir
+%exclude %{_x11fontdir}/OTF/fonts.dir
+%exclude %{_x11fontdir}/OTF/fonts.alias
+%exclude %{_x11fontdir}/OTF/fonts.scale
+%exclude %{_x11fontdir}/OTF/fonts.cache-*
 
 %{_catalogue}/xorg-x11-fonts-cyrillic
 %dir %{_x11fontdir}/cyrillic
@@ -535,6 +530,12 @@ done
 %{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf*
 
 %changelog
+* Thu Feb 6 2020 openEuler Buildteam <buildteam@openeuler.org> - 7.5-24
+- Type:enhancement
+- Id:NA
+- SUG:NA
+- DESC: remove ethiopic OTF fonts
+
 * Thu Jan 16 2020 Shuaishuai Song <songshuaishuai2@openeuler.org> - 7.5-23
 - Type:enhancement
 - Id:NA
-- 
Gitee


From 62c60bd3ade8545f8c6ecd26ee1b84b45a1b5923 Mon Sep 17 00:00:00 2001
From: zhanglu <zhanglu37@huawei.com>
Date: Thu, 6 Feb 2020 23:40:36 +0800
Subject: [PATCH 2/2] remove OTF fonts

---
 xorg-x11-fonts.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 5e3ab53..f8eab43 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -183,9 +183,6 @@ done
 
 %postun
 {
-  if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
-    xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/misc
-  fi
   if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
 	mkfontdir %{_x11fontdir}/75dpi
   fi
-- 
Gitee