From d0c1b2f9fdfddda365891da8f011631a20074416 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 22 Jan 2024 10:45:04 +0100 Subject: [PATCH] Fix rpmlint errors - three packages - tools-fonts, tools-dvips, tools-printing - contain only Bash scripts, so they can be noarch. In that case we don't require specific arch for ghostscript when we install those packages - we use `fc-list` during generating macros in spec file, so we need to have fontconfig in buildroot --- ghostscript.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/ghostscript.spec b/ghostscript.spec index 6adc090..f6f2042 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -54,8 +54,8 @@ Source: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases Requires: libgs%{?_isa} = %{version}-%{release} Requires: jbig2dec-libs = %{jbig2dec_version} -Requires: %{name}-tools-fonts%{?_isa} = %{version}-%{release} -Requires: %{name}-tools-printing%{?_isa} = %{version}-%{release} +Requires: %{name}-tools-fonts = %{version}-%{release} +Requires: %{name}-tools-printing = %{version}-%{release} Provides: ghostscript-core = %{version}-%{release} Obsoletes: ghostscript-core < 9.53.3-6 @@ -76,6 +76,8 @@ BuildRequires: urw-base35-fonts-devel # Already packaged software -- needed for debundling of Ghostscript: BuildRequires: cups-devel BuildRequires: dbus-devel +# we use fc-list in generating macros at the top of SPEC file +BuildRequires: fontconfig BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: jbig2dec-devel = %{jbig2dec_version} @@ -180,7 +182,8 @@ against Ghostscript's library, which provides Ghostscript's core functionality. # executable instead of package. %package tools-dvipdf Summary: Ghostscript's 'dvipdf' utility -Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} Requires: %{_bindir}/dvips %description tools-dvipdf @@ -191,7 +194,8 @@ PDF files using Ghostscript and dvips. %package tools-fonts Summary: Ghostscript's font utilities -Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} %description tools-fonts This package provides utilities which are useful when you are working with AFM, @@ -201,7 +205,8 @@ PFB or PFA files, mostly for conversion purposes. %package tools-printing Summary: Ghostscript's printing utilities -Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} %description tools-printing This package provides utilities for formatting and printing text files using @@ -424,6 +429,9 @@ done # ============================================================================= %changelog +* Mon Jan 22 2024 Zdenek Dohnal - 10.02.1-7 +- fix rpmlint errors + * Sat Jan 20 2024 Michael J Gruber - 10.02.1-7 - fix another FTBFS with GCC 14