From 7b5d9ed4df45a4e27f02dde4d36e9a6127bd8345bf523d7dc00a3981b2ccbe17 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 Jun 2022 13:47:14 +0000 Subject: [PATCH] Accepting request 982804 from home:dspinella:branches:LibreOffice:Factory - Use bundled openjpeg2 on SLE-12-SP5 OBS-URL: https://build.opensuse.org/request/show/982804 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1026 --- libreoffice.changes | 5 +++++ libreoffice.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 4c7a633..7581f47 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 15 13:35:15 UTC 2022 - Danilo Spinella + +- Use bundled openjpeg2 on SLE-12-SP5 + ------------------------------------------------------------------- Fri Jun 10 14:00:00 UTC 2022 - Danilo Spinella diff --git a/libreoffice.spec b/libreoffice.spec index b8c9945..124fa0f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -213,7 +213,6 @@ BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.19 BuildRequires: pkgconfig(libnumbertext) >= 1.0.6 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 -BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(liborcus-0.17) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpng) @@ -313,6 +312,7 @@ BuildRequires: pkgconfig(icu-i18n) BuildConflicts: java < 9 BuildConflicts: java-devel < 9 BuildConflicts: java-headless < 9 +BuildRequires: pkgconfig(libopenjp2) %endif %if 0%{?suse_version} # needed by python3_sitelib @@ -1175,6 +1175,9 @@ export NOCONFIGURE=yes %endif %if 0%{?suse_version} < 1500 --without-system-icu \ + --without-system-openjpeg \ +%else + --with-system-openjpeg \ %endif %if %{with system_curl} --with-system-curl \