Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
3a88299b6c
!21 [sync] PR-16: Add version for provides and obsoletes, replace tabs with spaces
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2024-09-04 03:42:22 +00:00
lingsheng
56db26d226 Add version for provides and obsoletes, replace tabs with spaces
(cherry picked from commit 91dfc621e4237802363b204bd46d8fca3073710d)
2024-09-03 15:11:38 +08:00
openeuler-ci-bot
39bae87179
!12 [sync] PR-9: fix license
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2024-06-17 08:17:41 +00:00
xh
bf8b6b989f fix license
(cherry picked from commit 234a8a444d4e5b7c2810289e8086c81b8e44e3e9)
2024-06-17 09:55:55 +08:00
openeuler-ci-bot
17e527e0eb
!6 【轻量级 PR】:rebuild for next release
From: @kerongw 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-10-26 11:59:31 +00:00
kerongw
4fe6a07aa1
rebuild for next release
Signed-off-by: kerongw <wangkerong@h-partners.com>
2022-10-26 06:09:08 +00:00
openeuler-ci-bot
0e09bf231b !4 add yaml file in package
Merge pull request !4 from gaoch_100/master
2020-07-21 11:23:57 +08:00
gaochao_100
6e7aafa661 add yaml file in package 2020-06-16 10:33:59 +08:00
openeuler-ci-bot
f64f4f6d5f !3 remove OTF fonts
Merge pull request !3 from Anonymous_Z/anonymous_z
2020-02-26 16:30:24 +08:00
zhanglu
62c60bd3ad remove OTF fonts 2020-02-06 23:40:36 +08:00
2 changed files with 54 additions and 41 deletions

View File

@ -4,8 +4,8 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
Version: 7.5
Release: 24
License: MIT and Lucida and Public Domain
Release: 27
License: MIT and Lucida-Bitmap-Fonts 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
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.
@ -183,14 +183,11 @@ 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
mkfontdir %{_x11fontdir}/75dpi
fi
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi
mkfontdir %{_x11fontdir}/100dpi
fi
}
@ -215,7 +212,7 @@ done
mkfontdir %{_x11fontdir}/100dpi
fi
if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then
mkfontdir %{_x11fontdir}/cyrillic
mkfontdir %{_x11fontdir}/cyrillic
fi
}
@ -530,6 +527,18 @@ 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

4
xorg-x11-fonts.yaml Normal file
View File

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