- Use system cmis where feasible, as our RPM version of cmis-devel has been

patched to work with Boost 1.86, which LibreOffice also uses.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1190

libreoffice.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 12 12:53:09 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
+
+- Use system cmis where feasible, as our RPM version of cmis-devel has been
+  patched to work with Boost 1.86, which LibreOffice also uses.
+
 Thu Aug 22 15:14:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
 - Make the libassuan requirement more generic (bsc#1229103)

libreoffice.spec

@@ -112,8 +112,6 @@ Source2008:     %{external_url}/pdfium-6425.tar.bz2
 Source2009:     %{external_url}/dtoa-20180411.tgz
 # Skia is part of chromium and bundled everywhere as by google only way is monorepo way
 Source2010:     %{external_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
-Source2012:     %{external_url}/libcmis-0.6.2.tar.xz
-Provides:       bundled(libcmis) = 0.6.2
 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
 # to avoid BerkleyDB incompatibility with the plain build
 Patch1:         scp2-user-config-suse.diff
@@ -309,12 +307,15 @@ Source2030:     %{external_url}/tiff-4.6.0t.tar.xz
 Provides:       bundled(boost) = 1.85.0
 Provides:       bundled(poppler) = 24.08.0
 Provides:       bundled(poppler-data) = 0.4.12
+Source2031:     %{external_url}/libcmis-0.6.2.tar.xz
+Provides:       bundled(libcmis) = 0.6.2
 %else
 BuildRequires:  libboost_date_time-devel
 BuildRequires:  libboost_filesystem-devel
 BuildRequires:  libboost_iostreams-devel
 BuildRequires:  libboost_locale-devel
 BuildRequires:  libboost_system-devel
+BuildRequires:  libcmis-devel
 BuildRequires:  pkgconfig(libtiff-4) >= 4.0.10
 BuildRequires:  pkgconfig(poppler) >= 21.01.0
 BuildRequires:  pkgconfig(poppler-cpp)
@@ -1190,7 +1191,6 @@ export NOCONFIGURE=yes
         --with-system-libpng \
         --with-system-dragonbox \
         --with-system-libfixmath \
-        --without-system-libcmis \
         --with-vendor=SUSE \
         --with-lang=ALL \
         --disable-fetch-external \
@@ -1249,6 +1249,7 @@ export NOCONFIGURE=yes
         --without-system-boost \
         --without-system-poppler \
         --without-system-libtiff \
+        --without-system-libcmis \
 %endif
 %if 0%{?suse_version} < 1500
         --without-system-argon2 \