Compare commits

..

No commits in common. "7ad67f14b02c5f36abb01e0e6ab22ea8d01b0fcb" and "f64f4f6d5f57502c214ad552d1170dba337441be" have entirely different histories.

2 changed files with 38 additions and 54 deletions

View File

@ -4,8 +4,8 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
Version: 7.5
Release: 27
License: MIT and Lucida-Bitmap-Fonts and Public Domain
Release: 24
License: MIT and Lucida and Public Domain
URL: http://www.x.org
BuildArch: noarch
@ -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
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}
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
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}
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
%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
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}
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
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}
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
%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,18 +527,6 @@ 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
- 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

View File

@ -1,4 +0,0 @@
version_control: NA
src_repo: NA
tag_prefix: NA
separator: .NA