diff --git a/libreoffice.spec b/libreoffice.spec index a1e2f04..6ac7776 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -122,9 +122,9 @@ Patch990: install-with-hardlinks.diff Patch991: libreoffice-no-destdircheck.patch # Fix build on sle12 Patch992: python34-no-f-strings.patch -BuildRequires: argon2-devel BuildRequires: %{name}-share-linker BuildRequires: ant +BuildRequires: argon2-devel BuildRequires: autoconf BuildRequires: awk BuildRequires: bison @@ -133,8 +133,8 @@ BuildRequires: commons-logging BuildRequires: cups-devel BuildRequires: fixmath-devel BuildRequires: libwebp-devel -BuildRequires: zlib-devel BuildRequires: libzxcvbn0-devel +BuildRequires: zlib-devel %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else @@ -320,17 +320,17 @@ BuildConflicts: java-devel >= 9 BuildConflicts: java-headless < 1.8 BuildConflicts: java-headless >= 9 Requires(post): update-desktop-files -Requires(postun):update-desktop-files +Requires(postun): update-desktop-files %else # genbrk binary is required BuildRequires: icu -BuildRequires: java-devel >= 17 +BuildRequires: java-devel >= 9 BuildRequires: libbox2d-devel BuildRequires: libmariadb-devel BuildRequires: pkgconfig(icu-i18n) -BuildConflicts: java < 17 -BuildConflicts: java-devel < 17 -BuildConflicts: java-headless < 17 +BuildConflicts: java < 9 +BuildConflicts: java-devel < 9 +BuildConflicts: java-headless < 9 BuildRequires: pkgconfig(libopenjp2) %endif BuildRequires: gcc12 @@ -423,7 +423,7 @@ This package includes the original branding for the LibreOffice office suite. Summary: LibreOffice Icon Themes Group: Productivity/Office/Suite Requires(post): %{name}-share-linker -Requires(postun):%{name}-share-linker +Requires(postun): %{name}-share-linker Supplements: libreoffice Provides: %{name}-icon-theme-breeze = %{version} Obsoletes: %{name}-icon-theme-breeze < %{version}