!16 Add version for provides and obsoletes, replace tabs with spaces

From: @ultra_planet 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-08-02 07:54:23 +00:00 committed by Gitee
commit 7ad67f14b0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -4,7 +4,7 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
Version: 7.5
Release: 26
Release: 27
License: MIT and Lucida-Bitmap-Fonts and Public Domain
URL: http://www.x.org
@ -48,21 +48,21 @@ BuildRequires: bdftopcf font-util >= 1.1.0 pkgconfig(xorg-macros) >= 1.3 uc
Requires(post): fontconfig mkfontdir
Requires(postun): fontconfig mkfontdir
Obsoletes: xorg-x11-fonts-base
Obsoletes: xorg-x11-fonts-misc
Obsoletes: xorg-x11-fonts-75dpi
Obsoletes: xorg-x11-fonts-100dpi
Obsoletes: xorg-x11-fonts-ISO8859-1-75dpi
Obsoletes: xorg-x11-fonts-ISO8859-1-100dpi
Obsoletes: xorg-x11-fonts-ISO8859-15-100dpi
Provides: xorg-x11-fonts-base = %{version}-%{release}
Provides: xorg-x11-fonts-misc = %{version}-%{release}
Provides: xorg-x11-fonts-75dpi = %{version}-%{release}
Provides: xorg-x11-fonts-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-1-75dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-1-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-15-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-base
Provides: xorg-x11-fonts-misc
Provides: xorg-x11-fonts-75dpi
Provides: xorg-x11-fonts-100dpi
Provides: xorg-x11-fonts-ISO8859-1-75dpi
Provides: xorg-x11-fonts-ISO8859-1-100dpi
Provides: xorg-x11-fonts-ISO8859-15-100dpi
Obsoletes: xorg-x11-fonts-base < %{version}-%{release}
Obsoletes: xorg-x11-fonts-misc < %{version}-%{release}
Obsoletes: xorg-x11-fonts-75dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-100dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-1-75dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-1-100dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-15-100dpi < %{version}-%{release}
%description
X.Org X Window System fonts. This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic
@ -78,26 +78,26 @@ Summary: Other X.Org X11 fonts
Requires(post): fontconfig mkfontdir mkfontscale
Requires(postun): fontconfig mkfontdir mkfontscale
Obsoletes: xorg-x11-fonts-cyrillic
Obsoletes: xorg-x11-fonts-ethiopic
Obsoletes: xorg-x11-fonts-Type1
Obsoletes: xorg-x11-fonts-ISO8859-14-75dpi
Obsoletes: xorg-x11-fonts-ISO8859-14-100dpi
Obsoletes: xorg-x11-fonts-ISO8859-15-75dpi
Obsoletes: xorg-x11-fonts-ISO8859-2-75dpi
Obsoletes: xorg-x11-fonts-ISO8859-2-100dpi
Obsoletes: xorg-x11-fonts-ISO8859-9-75dpi
Obsoletes: xorg-x11-fonts-ISO8859-9-100dpi
Provides: xorg-x11-fonts-cyrillic = %{version}-%{release}
Provides: xorg-x11-fonts-Type1 = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-14-75dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-14-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-15-75dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-2-75dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-2-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-9-75dpi = %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-9-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-cyrillic
Provides: xorg-x11-fonts-Type1
Provides: xorg-x11-fonts-ISO8859-14-75dpi
Provides: xorg-x11-fonts-ISO8859-14-100dpi
Provides: xorg-x11-fonts-ISO8859-15-75dpi
Provides: xorg-x11-fonts-ISO8859-2-75dpi
Provides: xorg-x11-fonts-ISO8859-2-100dpi
Provides: xorg-x11-fonts-ISO8859-9-75dpi
Provides: xorg-x11-fonts-ISO8859-9-100dpi
Obsoletes: xorg-x11-fonts-cyrillic < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ethiopic < %{version}-%{release}
Obsoletes: xorg-x11-fonts-Type1 < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-14-75dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-14-100dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-15-75dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-2-75dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-2-100dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-9-75dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-9-100dpi < %{version}-%{release}
%description others
This package includes other X.Org X Window System fonts.
@ -184,10 +184,10 @@ done
%postun
{
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi
mkfontdir %{_x11fontdir}/75dpi
fi
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi
mkfontdir %{_x11fontdir}/100dpi
fi
}
@ -212,7 +212,7 @@ done
mkfontdir %{_x11fontdir}/100dpi
fi
if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then
mkfontdir %{_x11fontdir}/cyrillic
mkfontdir %{_x11fontdir}/cyrillic
fi
}
@ -527,6 +527,9 @@ done
%{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf*
%changelog
* Thu Aug 01 2024 lingsheng <lingsheng1@h-partners.com> - 7.5-27
- Add version for provides and obsoletes, replace tabs with spaces
* Fri Jun 14 2024 xinghe <xinghe2@h-partners.com> - 7.5-26
- Type:bugfix
- Id:NA