pool/xorg-x11-fonts
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 799998 from home:alarrosa:branches:X11:XOrg

Browse Source 
- Differentiate also Requires, BuildRequires, Obsoletes and more
  statements between the two flavors.

OBS-URL: https://build.opensuse.org/request/show/799998
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-fonts?expand=0&rev=101
This commit is contained in:
Stefan Dirsch 2020-05-04 13:20:23 +00:00 committed by Git OBS Bridge
parent bf32a03e2e
commit 48b09937bc
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xorg-x11-fonts.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 4 08:29:42 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
- Differentiate also Requires, BuildRequires, Obsoletes and more
statements between the two flavors.
-------------------------------------------------------------------
Thu Apr 30 12:34:54 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>

36
xorg-x11-fonts.spec
View File

@ -24,29 +24,12 @@
%endif
Name: xorg-x11-fonts%{pkgflavor}
BuildRequires: bdftopcf
BuildRequires: fontpackages-devel
BuildRequires: mkfontscale
# ucs2any
BuildRequires: font-util
BuildRequires: pkgconfig
URL: http://xorg.freedesktop.org/
Version: 7.6
Release: 0
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: fonts-config
Requires: %{name}-core
Provides: xorg-x11-fonts-100dpi
Provides: xorg-x11-fonts-75dpi
Provides: xorg-x11-fonts-cyrillic
Provides: xorg-x11-fonts-scalable
Provides: xorg-x11-fonts-syriac
Obsoletes: xorg-x11-fonts-100dpi
Obsoletes: xorg-x11-fonts-75dpi
Obsoletes: xorg-x11-fonts-cyrillic
Obsoletes: xorg-x11-fonts-scalable
Obsoletes: xorg-x11-fonts-syriac
Summary: X.Org fonts
License: MIT
Group: System/X11/Fonts
@ -101,6 +84,25 @@ Requires(postun): fonts-config
# doesn't support Type1 fonts (boo#1169444)
Supplements: (xorg-x11-fonts and libpango-1_0-0)
%endif
%else
# "%%{flavor}" != "converted"
BuildRequires: bdftopcf
BuildRequires: fontpackages-devel
BuildRequires: mkfontscale
# ucs2any
BuildRequires: font-util
PreReq: fonts-config
Requires: %{name}-core
Provides: xorg-x11-fonts-100dpi
Provides: xorg-x11-fonts-75dpi
Provides: xorg-x11-fonts-cyrillic
Provides: xorg-x11-fonts-scalable
Provides: xorg-x11-fonts-syriac
Obsoletes: xorg-x11-fonts-100dpi
Obsoletes: xorg-x11-fonts-75dpi
Obsoletes: xorg-x11-fonts-cyrillic
Obsoletes: xorg-x11-fonts-scalable
Obsoletes: xorg-x11-fonts-syriac
%endif
%description