From 9375ee859844533419614ed1d170aa0fcac57f22 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Oct 05 2021 09:19:33 +0000 Subject: rhbz#2010520 move libroffice.jar to noarch java location --- diff --git a/libreoffice.spec b/libreoffice.spec index f7954a4..94bcd7b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -1505,7 +1505,7 @@ install -m 0755 -d %{buildroot}%{_javadir}/%{name} for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do j=`basename $jar` case ${j%.jar} in - juh|jurt|ridl|unoloader|unoil|officebean) + juh|jurt|libreoffice|ridl|unoloader|unoil|officebean) mv $jar %{buildroot}%{_javadir}/%{name} ln -sr %{buildroot}%{_javadir}/%{name}/$j $jar ;; @@ -2141,6 +2141,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %dir %{_javadir}/%{name} %{_javadir}/%{name}/juh.jar %{_javadir}/%{name}/jurt.jar +%{_javadir}/%{name}/libreoffice.jar %{_javadir}/%{name}/ridl.jar %{_javadir}/%{name}/unoloader.jar %license instdir/LICENSE @@ -2251,6 +2252,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Tue Oct 05 2021 Caolán McNamara - 1:7.1.6.2-2 +- rhbz#2010520 move libroffice.jar to noarch java location + * Thu Sep 02 2021 Caolán McNamara - 1:7.1.6.2-1 - latest 7-1 release