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
This commit is contained in:
Zdenek Dohnal 2024-01-22 10:45:04 +01:00
parent 14fce80add
commit d0c1b2f9fd

View File

@ -54,8 +54,8 @@ Source: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases
Requires: libgs%{?_isa} = %{version}-%{release} Requires: libgs%{?_isa} = %{version}-%{release}
Requires: jbig2dec-libs = %{jbig2dec_version} Requires: jbig2dec-libs = %{jbig2dec_version}
Requires: %{name}-tools-fonts%{?_isa} = %{version}-%{release} Requires: %{name}-tools-fonts = %{version}-%{release}
Requires: %{name}-tools-printing%{?_isa} = %{version}-%{release} Requires: %{name}-tools-printing = %{version}-%{release}
Provides: ghostscript-core = %{version}-%{release} Provides: ghostscript-core = %{version}-%{release}
Obsoletes: ghostscript-core < 9.53.3-6 Obsoletes: ghostscript-core < 9.53.3-6
@ -76,6 +76,8 @@ BuildRequires: urw-base35-fonts-devel
# Already packaged software -- needed for debundling of Ghostscript: # Already packaged software -- needed for debundling of Ghostscript:
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: dbus-devel BuildRequires: dbus-devel
# we use fc-list in generating macros at the top of SPEC file
BuildRequires: fontconfig
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
BuildRequires: jbig2dec-devel = %{jbig2dec_version} BuildRequires: jbig2dec-devel = %{jbig2dec_version}
@ -180,7 +182,8 @@ against Ghostscript's library, which provides Ghostscript's core functionality.
# executable instead of package. # executable instead of package.
%package tools-dvipdf %package tools-dvipdf
Summary: Ghostscript's 'dvipdf' utility Summary: Ghostscript's 'dvipdf' utility
Requires: %{name}%{?_isa} = %{version}-%{release} BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: %{_bindir}/dvips Requires: %{_bindir}/dvips
%description tools-dvipdf %description tools-dvipdf
@ -191,7 +194,8 @@ PDF files using Ghostscript and dvips.
%package tools-fonts %package tools-fonts
Summary: Ghostscript's font utilities Summary: Ghostscript's font utilities
Requires: %{name}%{?_isa} = %{version}-%{release} BuildArch: noarch
Requires: %{name} = %{version}-%{release}
%description tools-fonts %description tools-fonts
This package provides utilities which are useful when you are working with AFM, 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 %package tools-printing
Summary: Ghostscript's printing utilities Summary: Ghostscript's printing utilities
Requires: %{name}%{?_isa} = %{version}-%{release} BuildArch: noarch
Requires: %{name} = %{version}-%{release}
%description tools-printing %description tools-printing
This package provides utilities for formatting and printing text files using This package provides utilities for formatting and printing text files using
@ -424,6 +429,9 @@ done
# ============================================================================= # =============================================================================
%changelog %changelog
* Mon Jan 22 2024 Zdenek Dohnal <zdohnal@redhat.com> - 10.02.1-7
- fix rpmlint errors
* Sat Jan 20 2024 Michael J Gruber <mjg@fedoraproject.org> - 10.02.1-7 * Sat Jan 20 2024 Michael J Gruber <mjg@fedoraproject.org> - 10.02.1-7
- fix another FTBFS with GCC 14 - fix another FTBFS with GCC 14