From f5319c1e241ee82eab353696862519443890299e2f2991d4f236a2abeec1f8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 12 Feb 2021 08:34:03 +0000 Subject: [PATCH] Accepting request 871360 from LibreOffice:7.1 - Adjust to new Box2D and enable KDE on SLE15SP3 or newer OBS-URL: https://build.opensuse.org/request/show/871360 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=944 --- libreoffice.changes | 5 +++++ libreoffice.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 0015b16..f719b7d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 12 08:07:45 UTC 2021 - Markéta Machová + +- Adjust to new Box2D and enable KDE on SLE15SP3 or newer + ------------------------------------------------------------------- Mon Feb 1 13:08:22 UTC 2021 - Markéta Machová diff --git a/libreoffice.spec b/libreoffice.spec index 39f737e..16cc489 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,8 +28,8 @@ %else %bcond_with lto %endif -# Enable the kde integration on openSUSE and SLE15-SP3 only -%if 0%{?is_opensuse} || 0%{?sle_version} == 150300 +# Enable the kde integration on openSUSE and SLE15-SP3 or newer +%if 0%{?is_opensuse} || 0%{?sle_version} >= 150300 %bcond_without kdeintegration %else %bcond_with kdeintegration @@ -134,8 +134,8 @@ BuildRequires: hyphen-devel BuildRequires: icu BuildRequires: java-devel >= 9.0 BuildRequires: junit4 -BuildRequires: libBox2D-devel BuildRequires: libbase +BuildRequires: libbox2d-devel BuildRequires: libcppunit-devel >= 1.14.0 BuildRequires: liberation-fonts BuildRequires: libexif