rhbz#2010520 move libroffice.jar to noarch java location

f41
Caolán McNamara 3 years ago
parent 3054258a7f
commit 6f7a4c2716

@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.2 Version: %{libo_version}.2
Release: 3%{?libo_prerelease}%{?dist} Release: 4%{?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 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/ URL: http://www.libreoffice.org/
@ -1508,7 +1508,7 @@ install -m 0755 -d %{buildroot}%{_javadir}/%{name}
for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do
j=`basename $jar` j=`basename $jar`
case ${j%.jar} in case ${j%.jar} in
juh|jurt|ridl|unoloader|unoil|officebean) juh|jurt|libreoffice|ridl|unoloader|unoil|officebean)
mv $jar %{buildroot}%{_javadir}/%{name} mv $jar %{buildroot}%{_javadir}/%{name}
ln -sr %{buildroot}%{_javadir}/%{name}/$j $jar ln -sr %{buildroot}%{_javadir}/%{name}/$j $jar
;; ;;
@ -2140,6 +2140,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%dir %{_javadir}/%{name} %dir %{_javadir}/%{name}
%{_javadir}/%{name}/juh.jar %{_javadir}/%{name}/juh.jar
%{_javadir}/%{name}/jurt.jar %{_javadir}/%{name}/jurt.jar
%{_javadir}/%{name}/libreoffice.jar
%{_javadir}/%{name}/ridl.jar %{_javadir}/%{name}/ridl.jar
%{_javadir}/%{name}/unoloader.jar %{_javadir}/%{name}/unoloader.jar
%license instdir/LICENSE %license instdir/LICENSE
@ -2251,6 +2252,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Tue Oct 05 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.1.2-4
- rhbz#2010520 move libroffice.jar to noarch java location
* Wed Sep 22 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.1.2-3 * Wed Sep 22 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.1.2-3
- reenable make check for s390x - reenable make check for s390x

Loading…
Cancel
Save