From cb34c9d32b270597c68d6ee40d191f97263922a22a39104667d36ad621a05cc4 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 3 Feb 2020 09:20:23 +0000 Subject: [PATCH] Accepting request 769173 from home:StefanBruens:branches:Printing - Use system openjpeg2 on Tumbleweed/Factory. Also see https://build.opensuse.org/request/show/769172 OBS-URL: https://build.opensuse.org/request/show/769173 OBS-URL: https://build.opensuse.org/package/show/Printing/ghostscript?expand=0&rev=124 --- ghostscript-mini.spec | 2 +- ghostscript.changes | 5 +++++ ghostscript.spec | 9 +++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ghostscript-mini.spec b/ghostscript-mini.spec index 1fd2e66..bb469ce 100644 --- a/ghostscript-mini.spec +++ b/ghostscript-mini.spec @@ -1,7 +1,7 @@ # # spec file for package ghostscript-mini # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/ghostscript.changes b/ghostscript.changes index ebeda27..8e06409 100644 --- a/ghostscript.changes +++ b/ghostscript.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 31 17:26:37 UTC 2020 - Stefan BrĂ¼ns + +- Use system openjpeg2 on Tumbleweed/Factory. + ------------------------------------------------------------------- Mon Sep 23 08:24:49 UTC 2019 - Johannes Segitz diff --git a/ghostscript.spec b/ghostscript.spec index 16cb20b..59291c6 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -1,7 +1,7 @@ # # spec file for package ghostscript # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -47,7 +47,9 @@ BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-fonts BuildRequires: zlib-devel # Always check if latest version of penjpeg becomes compatible with ghostscript -#BuildRequires: pkgconfig(libopenjp2) +%if 0%{?suse_version} >= 1550 +BuildRequires: pkgconfig(libopenjp2) >= 2.3.1 +%endif %if 0%{?suse_version} >= 1500 BuildRequires: apparmor-abstractions BuildRequires: apparmor-rpm-macros @@ -322,6 +324,9 @@ rm -rf jpeg libpng tiff %else rm -rf freetype jpeg libpng tiff %endif +%if 0%{?suse_version} >= 1550 +rm -rf openjpeg +%endif # In contrast to the above we use lcms2 from SUSE since Ghostscript 9.23rc1 # because that is what Ghostscript upstream recommends according to # https://ghostscript.com/pipermail/gs-devel/2018-March/010061.html