From 093c4953a62c12cf0335025c6a9aa9bad0b86cf1 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 23 Mar 2020 18:35:56 +0100
Subject: [PATCH] Fix Flatpak-from-RPM build

...after flatpak-rpm-macros-31-1 now causes the runtime dependency
apache-commons-logging to (correctly) install commons-logging-1.2.jar in
/app/share/java/ rather than /usr/share/java/
---
 libreoffice.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libreoffice.spec b/libreoffice.spec
index 2e119de..8ebf4ba 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1038,7 +1038,7 @@ SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
 
 %if 0%{?flatpak}
-%define flatpakoptions --with-boost-libdir=%{_libdir} --with-jfreereport-jar=/app/share/java/flow-engine.jar --with-libbase-jar=/app/share/java/libbase.jar --with-libfonts-jar=/app/share/java/libfonts.jar --with-libformula-jar=/app/share/java/libformula.jar --with-liblayout-jar=/app/share/java/liblayout.jar --with-libloader-jar=/app/share/java/libloader.jar --with-librepository-jar=/app/share/java/librepository.jar --with-libserializer-jar=/app/share/java/libserializer.jar --with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir}
+%define flatpakoptions --with-boost-libdir=%{_libdir} --with-commons-logging-jar=/app/share/java/commons-logging-1.2.jar --with-jfreereport-jar=/app/share/java/flow-engine.jar --with-libbase-jar=/app/share/java/libbase.jar --with-libfonts-jar=/app/share/java/libfonts.jar --with-libformula-jar=/app/share/java/libformula.jar --with-liblayout-jar=/app/share/java/liblayout.jar --with-libloader-jar=/app/share/java/libloader.jar --with-librepository-jar=/app/share/java/librepository.jar --with-libserializer-jar=/app/share/java/libserializer.jar --with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir}
 %endif
 
 # TODO: enable coinmp?