!13 [sync] PR-9: fix license

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

xorg-x11-fonts.spec

@@ -4,8 +4,8 @@
 Summary:    X.Org X11 fonts
 Name:       xorg-x11-fonts
 Version:    7.5
-Release:    22
+Release:    26
-License:    MIT and Lucida and Public Domain
+License:    MIT and Lucida-Bitmap-Fonts and Public Domain
 URL:        http://www.x.org
 
 BuildArch:  noarch
@@ -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(post):     fontconfig mkfontdir mkfontscale
-Requires(postun):   fontconfig mkfontdir mkfontscale ttmkfdir
+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
@@ -184,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
@@ -197,8 +193,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
   mkfontdir %{_x11fontdir}/100dpi
@@ -207,14 +201,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
-  fi
   FONTDIR=%{_x11fontdir}/Type1
   if [ "$1" = "0" -a -d $FONTDIR ]; then
     xorg-x11-fonts-update-dirs $FONTDIR
@@ -360,22 +346,22 @@ 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
+%exclude %{_catalogue}/xorg-x11-fonts-OTF
-%dir %{_x11fontdir}/TTF
+%exclude %dir %{_x11fontdir}/TTF
-%{_x11fontdir}/TTF/GohaTibebZemen.ttf
+%exclude %{_x11fontdir}/TTF/GohaTibebZemen.ttf
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/encodings.dir
+%exclude %{_x11fontdir}/TTF/encodings.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.dir
+%exclude %{_x11fontdir}/TTF/fonts.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.alias
+%exclude %{_x11fontdir}/TTF/fonts.alias
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.scale
+%exclude %{_x11fontdir}/TTF/fonts.scale
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.cache-*
+%exclude %{_x11fontdir}/TTF/fonts.cache-*
-%dir %{_x11fontdir}/OTF
+%exclude %dir %{_x11fontdir}/OTF
-%{_x11fontdir}/OTF/GohaTibebZemen.otf
+%exclude %{_x11fontdir}/OTF/GohaTibebZemen.otf
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/encodings.dir
+%exclude %{_x11fontdir}/OTF/encodings.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.dir
+%exclude %{_x11fontdir}/OTF/fonts.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.alias
+%exclude %{_x11fontdir}/OTF/fonts.alias
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.scale
+%exclude %{_x11fontdir}/OTF/fonts.scale
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.cache-*
+%exclude %{_x11fontdir}/OTF/fonts.cache-*
 
 %{_catalogue}/xorg-x11-fonts-cyrillic
 %dir %{_x11fontdir}/cyrillic
@@ -541,6 +527,27 @@ done
 %{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf*
 
 %changelog
+* Fri Jun 14 2024 xinghe <xinghe2@h-partners.com> - 7.5-26
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:fix license
+
+* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 7.5-25
+- rebuild for next release
+
+* 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
+- SUG:NA
+- DESC: remove ethiopic TTF fonts
+
 * Thu Jan 09 2020 openEuler Buildteam <buildteam@openeuler.org> - 7.5-22
 - Type:enhancement
 - Id:NA

xorg-x11-fonts.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: eurolinux-enterprise-linux-sources/xorg-x11-fonts
+tag_prefix: 
+seperator: .