Add version for provides and obsoletes, replace tabs with spaces

This commit is contained in:
lingsheng 2024-08-01 07:07:53 +00:00
parent 979fbc5098
commit 91dfc621e4

View File

@ -4,7 +4,7 @@
Summary: X.Org X11 fonts Summary: X.Org X11 fonts
Name: xorg-x11-fonts Name: xorg-x11-fonts
Version: 7.5 Version: 7.5
Release: 26 Release: 27
License: MIT and Lucida-Bitmap-Fonts and Public Domain License: MIT and Lucida-Bitmap-Fonts and Public Domain
URL: http://www.x.org 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(post): fontconfig mkfontdir
Requires(postun): fontconfig mkfontdir Requires(postun): fontconfig mkfontdir
Obsoletes: xorg-x11-fonts-base Provides: xorg-x11-fonts-base = %{version}-%{release}
Obsoletes: xorg-x11-fonts-misc Provides: xorg-x11-fonts-misc = %{version}-%{release}
Obsoletes: xorg-x11-fonts-75dpi Provides: xorg-x11-fonts-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-100dpi Provides: xorg-x11-fonts-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-1-75dpi Provides: xorg-x11-fonts-ISO8859-1-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-1-100dpi Provides: xorg-x11-fonts-ISO8859-1-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-15-100dpi Provides: xorg-x11-fonts-ISO8859-15-100dpi = %{version}-%{release}
Provides: xorg-x11-fonts-base Obsoletes: xorg-x11-fonts-base < %{version}-%{release}
Provides: xorg-x11-fonts-misc Obsoletes: xorg-x11-fonts-misc < %{version}-%{release}
Provides: xorg-x11-fonts-75dpi Obsoletes: xorg-x11-fonts-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-100dpi Obsoletes: xorg-x11-fonts-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-1-75dpi Obsoletes: xorg-x11-fonts-ISO8859-1-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-1-100dpi Obsoletes: xorg-x11-fonts-ISO8859-1-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-15-100dpi Obsoletes: xorg-x11-fonts-ISO8859-15-100dpi < %{version}-%{release}
%description %description
X.Org X Window System fonts. This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic 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(post): fontconfig mkfontdir mkfontscale
Requires(postun): fontconfig mkfontdir mkfontscale Requires(postun): fontconfig mkfontdir mkfontscale
Obsoletes: xorg-x11-fonts-cyrillic Provides: xorg-x11-fonts-cyrillic = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ethiopic Provides: xorg-x11-fonts-Type1 = %{version}-%{release}
Obsoletes: xorg-x11-fonts-Type1 Provides: xorg-x11-fonts-ISO8859-14-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-14-75dpi Provides: xorg-x11-fonts-ISO8859-14-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-14-100dpi Provides: xorg-x11-fonts-ISO8859-15-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-15-75dpi Provides: xorg-x11-fonts-ISO8859-2-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-2-75dpi Provides: xorg-x11-fonts-ISO8859-2-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-2-100dpi Provides: xorg-x11-fonts-ISO8859-9-75dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-9-75dpi Provides: xorg-x11-fonts-ISO8859-9-100dpi = %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-9-100dpi
Provides: xorg-x11-fonts-cyrillic Obsoletes: xorg-x11-fonts-cyrillic < %{version}-%{release}
Provides: xorg-x11-fonts-Type1 Obsoletes: xorg-x11-fonts-ethiopic < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-14-75dpi Obsoletes: xorg-x11-fonts-Type1 < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-14-100dpi Obsoletes: xorg-x11-fonts-ISO8859-14-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-15-75dpi Obsoletes: xorg-x11-fonts-ISO8859-14-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-2-75dpi Obsoletes: xorg-x11-fonts-ISO8859-15-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-2-100dpi Obsoletes: xorg-x11-fonts-ISO8859-2-75dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-9-75dpi Obsoletes: xorg-x11-fonts-ISO8859-2-100dpi < %{version}-%{release}
Provides: xorg-x11-fonts-ISO8859-9-100dpi Obsoletes: xorg-x11-fonts-ISO8859-9-75dpi < %{version}-%{release}
Obsoletes: xorg-x11-fonts-ISO8859-9-100dpi < %{version}-%{release}
%description others %description others
This package includes other X.Org X Window System fonts. This package includes other X.Org X Window System fonts.
@ -184,10 +184,10 @@ done
%postun %postun
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi
fi fi
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi
fi fi
} }
@ -212,7 +212,7 @@ done
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi
fi fi
if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then
mkfontdir %{_x11fontdir}/cyrillic mkfontdir %{_x11fontdir}/cyrillic
fi fi
} }
@ -527,6 +527,9 @@ done
%{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf* %{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf*
%changelog %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 * Fri Jun 14 2024 xinghe <xinghe2@h-partners.com> - 7.5-26
- Type:bugfix - Type:bugfix
- Id:NA - Id:NA