The package rpms/terminus-fonts.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/terminus-fonts.git/commit/?id=ff6....
Change:
+%ifnarch %{grub2_exclude_arches}
Thanks.
Full change:
============
commit feb804975e0ab480e3fbd564f85e5dcf0307137a
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sun Jan 27 21:53:52 2019 +0100
terminus-fonts-4.47-4
* Sun Jan 27 2019 Hans Ulrich Niedermann <hun(a)n-dimensional.de> - 4.47-4
- Only build -grub2 subpackage when arch/dist actually has grub2
- Address and silence rpmlint warnings
diff --git a/terminus-fonts.spec b/terminus-fonts.spec
index 8269119..e7eb126 100644
--- a/terminus-fonts.spec
+++ b/terminus-fonts.spec
@@ -52,7 +52,7 @@ The font is available for the Linux console and for X11.
Name: %{fontname}-fonts
Version: 4.47
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Clean fixed width font
Group: User Interface/X
@@ -457,6 +457,10 @@ ln -s %{_fontdir} %{buildroot}%{catalog}/%{fontname}:unscaled
%changelog
+* Sun Jan 27 2019 Hans Ulrich Niedermann <hun(a)n-dimensional.de> - 4.47-4
+- Only build -grub2 subpackage when arch/dist actually has grub2
+- Address and silence rpmlint warnings
+
* Tue Jan 15 2019 Hans Ulrich Niedermann <hun(a)n-dimensional.de> - 4.47-3
- Update to upstream release terminus-font-4.47
commit ff672ddb147252b99550c5103b31331d5dee4db8
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sun Jan 27 21:51:46 2019 +0100
Only build -grub2 subpackage on distro and arches with grub available
diff --git a/terminus-fonts.spec b/terminus-fonts.spec
index f2ea04c..8269119 100644
--- a/terminus-fonts.spec
+++ b/terminus-fonts.spec
@@ -8,9 +8,22 @@
# Owned by the kbd package, which hardcodes it as /lib/kbd (without macros).
%global consolefontdir /lib/kbd/consolefonts
+
+# The ExcludeArch from the grub2.spec file
+#
+# There might be a better way to detect whether this platform has
+# grub2 available, but this should do the job at least for the time
+# being.
+%if 0%{?fedora} >= 29
+%global grub2_exclude_arches s390 s390x
+%else
+%global grub2_exclude_arches s390 s390x %{arm}
+%endif
+
# Owned by the grub2-common package
%global grub2fontdir /usr/share/grub
+
# Font catalog
%global catalog %{_sysconfdir}/X11/fontpath.d
@@ -63,7 +76,9 @@ BuildRequires: python3 >= 3.5.0
BuildRequires: /usr/bin/bdftopcf
BuildRequires: /usr/bin/mkfontdir
+%ifnarch %{grub2_exclude_arches}
BuildRequires: /usr/bin/grub2-mkfont
+%endif
%description
%common_desc
@@ -85,6 +100,7 @@ License: OFL
This package contains the fonts to use with the Linux console.
+%ifnarch %{grub2_exclude_arches}
%package grub2
Requires: grub2-common
Summary: Clean fixed width font (grub2 version)
@@ -94,6 +110,7 @@ License: OFL
%common_desc
This package contains the fonts to use with the grub2 boot loader.
+%endif
%prep
@@ -110,10 +127,12 @@ iconv -f WINDOWS-1251 -t utf-8 -o README-BG README-BG
--x11dir=%{_fontdir} --psfdir=%{consolefontdir}
env GZIP=--best make %{?_smp_mflags} PCF='$(PCF_10646_1) $(PCF_8BIT)' pcf psf
psf-vgaw
+%ifnarch %{grub2_exclude_arches}
# generate *.pf2 for the grub2 bootloader
for bdf in ter-*.bdf; do
/usr/bin/grub2-mkfont -o "$(basename "$bdf" .bdf).pf2"
"$bdf"
done
+%endif
# Fedora specific docs and examples
mkdir -p docs/console docs/x11
@@ -125,9 +144,11 @@ cp -p "%{SOURCE21}" docs/x11/Xresources.example
%install
make DESTDIR="%{buildroot}" PCF='$(PCF_10646_1) $(PCF_8BIT)'
install-psf install-psf-ref install-psf-vgaw install-pcf
+%ifnarch %{grub2_exclude_arches}
# install *.pf2 for the grub2 bootloader
install -m 0755 -d %{buildroot}%{grub2fontdir}
install -m 0644 -t %{buildroot}%{grub2fontdir} ter-*.pf2
+%endif
# hook the X11 fonts into fontconfig
install -m 0755 -d \
@@ -409,6 +430,7 @@ ln -s %{_fontdir} %{buildroot}%{catalog}/%{fontname}:unscaled
%{consolefontdir}/ter-v32n.psf.gz
+%ifnarch %{grub2_exclude_arches}
%files grub2
%doc README README-BG
%{grub2fontdir}/ter-u12b.pf2
@@ -431,6 +453,7 @@ ln -s %{_fontdir} %{buildroot}%{catalog}/%{fontname}:unscaled
%{grub2fontdir}/ter-u28n.pf2
%{grub2fontdir}/ter-u32b.pf2
%{grub2fontdir}/ter-u32n.pf2
+%endif
%changelog
commit eb7ceb6cdf586ceb00fbda19bdd38e1353c6c4b4
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sat Jan 26 14:26:14 2019 +0100
Add Provides: where we have Obsoletes: (silences rpmlint)
diff --git a/terminus-fonts.spec b/terminus-fonts.spec
index 6c9e083..f2ea04c 100644
--- a/terminus-fonts.spec
+++ b/terminus-fonts.spec
@@ -31,6 +31,12 @@ plus EGA/VGA-bold for 8x14 and 8x16.\
The font is available for the Linux console and for X11.
+%if %{?epoch: 1}%{?!epoch: 0}
+%global evr %{epoch}:%{version}-%{release}
+%else
+%global evr %{version}-%{release}
+%endif
+
Name: %{fontname}-fonts
Version: 4.47
Release: 3%{?dist}
@@ -51,6 +57,7 @@ BuildRequires: fontpackages-devel >= 1.18
Requires: fontpackages-filesystem
Obsoletes: terminus-font-x11 < 4.28-2
+Provides: terminus-font-x11 = %{evr}
BuildRequires: python3 >= 3.5.0
BuildRequires: /usr/bin/bdftopcf
@@ -69,6 +76,7 @@ Requires: kbd
Group: User Interface/X
Summary: Clean fixed width font (console version)
Obsoletes: terminus-font-console < 4.28-2
+Provides: terminus-font-console = %{evr}
License: OFL
%description console
commit d6c52adf99f52c7b184805c18db9423564b828b5
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sat Jan 26 14:25:09 2019 +0100
Silence rpmlint warning on hardcoded /lib
We are using /lib/kbd/consolefonts for installing the console fonts.
That is the place where kbd-misc expects its fonts, and has nothing
to do with a library directory.
diff --git a/terminus-fonts.rpmlintrc b/terminus-fonts.rpmlintrc
new file mode 100644
index 0000000..5008ed5
--- /dev/null
+++ b/terminus-fonts.rpmlintrc
@@ -0,0 +1,3 @@
+# -*- python -*-
+
+addFilter(r'hardcoded-library-path in /lib/kbd/consolefonts')