From b6da081075b099c09af066494ad745159a971c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 30 Jun 2021 09:29:14 +0100 Subject: [PATCH] drop bsh buildrequires in rhel --- libreoffice.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index a112ceb..b677948 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/ @@ -219,7 +219,9 @@ BuildRequires: libnumbertext-devel # java stuff BuildRequires: ant +%if 0%{?fedora} BuildRequires: bsh +%endif BuildRequires: java-devel BuildRequires: junit BuildRequires: pentaho-reporting-flow-engine @@ -2244,6 +2246,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Wed Jun 30 2021 Caolán McNamara - 1:7.1.4.2-2 +- Remove unused DOCTYPE from odk/examples xcu file +- drop bsh buildrequires in rhel + * Wed Jun 09 2021 Caolán McNamara - 1:7.1.4.2-1 - latest version - replace 'badfuncs' of inet_addr and inet_ntoa