Resolves: rhbz#1977653 drop unneeded bsh build-dependency

0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch

@@ -0,0 +1,36 @@
+From a344462ccb324b14dbf17391146f78d84307cbec Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 22 Jun 2021 14:14:34 +0200
+Subject: [PATCH] Remove unused DOCTYPE from odk/examples xcu file
+
+The declared entities have apparently never been referenced ever since the
+file's introduction in 9fa09d43d0dc0ec0ac71bad31b85ce7fc302ee90 "INTEGRATION:
+CWS sdkinspector2".  (And at least xmlreader skips and ignores the content of
+such document type declarations anyway.)
+
+Change-Id: I8263200f52bb5f1692090995574619f9c0ec478f
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117658
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ odk/examples/java/Inspector/ObjectInspector.xcu | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/odk/examples/java/Inspector/ObjectInspector.xcu b/odk/examples/java/Inspector/ObjectInspector.xcu
+index b7696086629c..d6fb08a0f8ce 100644
+--- a/odk/examples/java/Inspector/ObjectInspector.xcu
++++ b/odk/examples/java/Inspector/ObjectInspector.xcu
+@@ -16,10 +16,6 @@
+  *   except in compliance with the License. You may obtain a copy of
+  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+-<!DOCTYPE local [
+-    <!ENTITY ProductName "Object Inspector">
+-    <!ENTITY ProductVersion "0.8">
+-]>
+ <oor:component-data
+     xmlns:oor="http://openoffice.org/2001/registry"
+     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+-- 
+2.31.1
+

0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch

@@ -0,0 +1,39 @@
+From 68a6c70f25762374f7aed0d4d755345c6f37c78d Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Mon, 31 May 2021 10:56:38 +0200
+Subject: [PATCH] Simplify construction of a hardcoded IPv4 address
+
+Change-Id: I822313ee708935dd4ecb636c13a961fdd054d660
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116434
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ sd/source/ui/remotecontrol/DiscoveryService.cxx | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
+index 9ed2ae727761..cf0043387403 100644
+--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
++++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
+@@ -119,17 +119,7 @@ void DiscoveryService::setupSockets()
+ 
+     struct ip_mreq multicastRequest;
+ 
+-// the Win32 SDK 8.1 deprecates inet_addr()
+-#if defined(_WIN32)
+-    IN_ADDR addr;
+-    INT ret = InetPtonW(AF_INET, L"239.0.0.1", & addr);
+-    if (1 == ret)
+-    {
+-        multicastRequest.imr_multiaddr.s_addr = addr.S_un.S_addr;
+-    }
+-#else
+-    multicastRequest.imr_multiaddr.s_addr = inet_addr( "239.0.0.1" );
+-#endif
++    multicastRequest.imr_multiaddr.s_addr = htonl((239U << 24) | 1U); // 239.0.0.1
+     multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
+ 
+     rc = setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+-- 
+2.31.1
+

libreoffice.spec

@@ -50,7 +50,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?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
@@ -254,8 +256,11 @@ Patch6: 0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch
 Patch7: 0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch
 Patch8: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch
 Patch9: 0001-Replace-inet_ntoa-with-inet_ntop.patch
-Patch10: 0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch
+Patch10: 0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch
-Patch11: 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch
+Patch11: 0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch
+Patch12: 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch
+Patch13: 0001-allow-system-firebird-4.patch
+Patch14: 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch
 
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch
@@ -2241,6 +2246,11 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Wed Jun 30 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.4.2-3
+- rhbz#1977653 drop unneeded bsh build-dependency
+- Remove unused DOCTYPE from odk/examples xcu file
+- drop bsh buildrequires in rhel
+
 * Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com>
 - Rebuilt for RHEL 9 BETA for openssl 3.0
   Related: rhbz#1971065