really require the exact jbig2dec version

673c823 ("Require the exact jbig2dec version in both build and runtime
dependencies", 2020-06-24) introduced a lower bound for the version. But
apparantly ghostscript complains even about newer versions (see e.g.
https://bodhi.fedoraproject.org/updates/FEDORA-2020-df4550580d).

So, make this a check on the exact jbig2dec version (but not the full
package version).
This commit is contained in:
Michael J Gruber 2020-07-02 14:46:56 +02:00
parent 6ccc8d11a9
commit 8332a368b7

View File

@ -39,8 +39,7 @@
%global google_droid_fontpath %%(dirname $(fc-list : file | grep "DroidSansFallback")) %global google_droid_fontpath %%(dirname $(fc-list : file | grep "DroidSansFallback"))
# Desired jbig2dec header files and library version # Desired jbig2dec header files and library version
# Oldest possible, will be used in Requires and in configure script to check # Apparantly, ghostscript complains even about newer versions
# if the correct header files and libraries are installed
# Please update if needed. # Please update if needed.
%global jbig2dec_version 0.18 %global jbig2dec_version 0.18
@ -49,7 +48,7 @@
Name: ghostscript Name: ghostscript
Summary: Interpreter for PostScript language & PDF Summary: Interpreter for PostScript language & PDF
Version: 9.52 Version: 9.52
Release: 6%{?dist} Release: 7%{?dist}
License: AGPLv3+ License: AGPLv3+
@ -57,7 +56,7 @@ URL: https://ghostscript.com/
Source: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%{version_short}/ghostscript-%{version}.tar.xz Source: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%{version_short}/ghostscript-%{version}.tar.xz
Requires: libgs%{?_isa} = %{version}-%{release} Requires: libgs%{?_isa} = %{version}-%{release}
Requires: jbig2dec-libs >= %{jbig2dec_version} Requires: jbig2dec-libs = %{jbig2dec_version}
# Auxiliary build requirements: # Auxiliary build requirements:
BuildRequires: automake BuildRequires: automake
@ -75,8 +74,8 @@ BuildRequires: cups-devel
BuildRequires: dbus-devel BuildRequires: dbus-devel
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
BuildRequires: jbig2dec-devel >= %{jbig2dec_version} BuildRequires: jbig2dec-devel = %{jbig2dec_version}
BuildRequires: jbig2dec-libs >= %{jbig2dec_version} BuildRequires: jbig2dec-libs = %{jbig2dec_version}
BuildRequires: lcms2-devel BuildRequires: lcms2-devel
BuildRequires: libidn-devel BuildRequires: libidn-devel
BuildRequires: libijs-devel BuildRequires: libijs-devel
@ -467,6 +466,9 @@ done
# ============================================================================= # =============================================================================
%changelog %changelog
* Thu Jul 02 2020 Michael J Gruber <mjg@fedoraproject.org> - 9.52-7
- really require the exact jbig2dec version
* Sat Jun 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 9.52-6 * Sat Jun 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 9.52-6
- standard packages should not require -devel packages - standard packages should not require -devel packages