Rebase RHEL patch to disable libe-book support to libreoffice-7.0

Add BR perl(base)

0001-disable-libe-book-support.patch

@@ -1,4 +1,4 @@
-From 613af296887aede8f5b0fa6f94f7fb2781403ef2 Mon Sep 17 00:00:00 2001
+From 4cac125f90e0a3d6828d879cb06f3a4bac14321b Mon Sep 17 00:00:00 2001
 From: David Tardon <dtardon@redhat.com>
 Date: Thu, 21 Aug 2014 16:10:51 +0200
 Subject: [PATCH] disable libe-book support
@@ -9,16 +9,16 @@ Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
  external/Module_external.mk                      | 1 -
  filter/Configuration_filter.mk                   | 8 --------
  writerperfect/Library_wpftwriter.mk              | 2 --
- writerperfect/qa/unit/WpftFilterFixture.hxx      | 3 ---
+ writerperfect/qa/unit/WpftFilterFixture.hxx      | 4 ----
  writerperfect/qa/unit/WpftWriterFilterTest.cxx   | 5 -----
  writerperfect/source/writer/wpftwriter.component | 5 -----
- 7 files changed, 27 deletions(-)
+ 7 files changed, 28 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ac8dbc5..bb08d21 100644
+index fe425319b8f8..4b8f6a95472c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -7696,9 +7696,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
+@@ -8566,9 +8566,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
  
  libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
  
@@ -29,22 +29,22 @@ index ac8dbc5..bb08d21 100644
  
  libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
 diff --git a/external/Module_external.mk b/external/Module_external.mk
-index 590e216..8f19768 100644
+index 41e018d2ef3f..1b7627a1b3e2 100644
 --- a/external/Module_external.mk
 +++ b/external/Module_external.mk
-@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
- 	$(call gb_Helper_optional,CPPUNIT,cppunit) \
+@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
  	$(call gb_Helper_optional,CT2N,ct2n) \
  	$(call gb_Helper_optional,CURL,curl) \
+ 	dtoa \
 -	$(call gb_Helper_optional,EBOOK,libebook) \
  	$(call gb_Helper_optional,EPM,epm) \
  	$(call gb_Helper_optional,EPOXY,epoxy) \
  	$(call gb_Helper_optional,EPUBGEN,libepubgen) \
 diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
-index 7b39020..588fa01 100644
+index e71ffacf8f25..74d2ef05c4aa 100644
 --- a/filter/Configuration_filter.mk
 +++ b/filter/Configuration_filter.mk
-@@ -346,10 +346,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
+@@ -358,10 +358,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
  	writer_OOXML \
  	writer_OOXML_Template \
  	writer_layout_dump_xml \
@@ -55,7 +55,7 @@ index 7b39020..588fa01 100644
  	writer_ApplePages \
  	MWAW_Text_Document \
  	Palm_Text_Document \
-@@ -394,10 +390,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
+@@ -406,10 +402,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
  	OOXML_Text \
  	OOXML_Text_Template \
  	writer_layout_dump \
@@ -67,10 +67,10 @@ index 7b39020..588fa01 100644
  	MWAW_Text_Document \
  	Palm_Text_Document \
 diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
-index bf605e7..54a702e 100644
+index 8993cca31490..b6e11f356d97 100644
 --- a/writerperfect/Library_wpftwriter.mk
 +++ b/writerperfect/Library_wpftwriter.mk
-@@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
+@@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
  $(eval $(call gb_Library_use_externals,wpftwriter,\
  	abw \
  	boost_headers \
@@ -78,7 +78,7 @@ index bf605e7..54a702e 100644
  	epubgen \
  	etonyek \
  	icu_headers \
-@@ -67,7 +66,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
+@@ -73,7 +72,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
  
  $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
  	writerperfect/source/writer/AbiWordImportFilter \
@@ -87,44 +87,45 @@ index bf605e7..54a702e 100644
  	writerperfect/source/writer/EPUBExportFilter \
  	writerperfect/source/writer/EPUBExportUIComponent \
 diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
-index 14ad4ea..63aff41 100644
+index f32478165617..f42edb0d7f55 100644
 --- a/writerperfect/qa/unit/WpftFilterFixture.hxx
 +++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
-@@ -27,9 +27,6 @@
-         ((minor) > (req_minor) \
-          || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
+@@ -26,10 +26,6 @@
+         || ((major) == (req_major)                                                                 \
+             && ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
  
 -#define REQUIRE_EBOOK_VERSION(major, minor, micro)                                                 \
--    REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro)
+-    REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor,   \
+-                    micro)
 -
  #define REQUIRE_ETONYEK_VERSION(major, minor, micro)                                               \
-     REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro)
- 
+     REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major,    \
+                     minor, micro)
 diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
-index 515a2b8..3180a99 100644
+index 8bc4c7cadbb3..eca43caf8d8c 100644
 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
 +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
-@@ -31,10 +31,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
+@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
  
  void WpftWriterFilterTest::test()
  {
--    const writerperfect::test::WpftOptionalMap_t aEBookOptional
--    {
+-    const writerperfect::test::WpftOptionalMap_t aEBookOptional{
 -        { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) },
 -    };
-     const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
-     {
+     const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
          { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
-@@ -58,7 +54,6 @@ void WpftWriterFilterTest::test()
-     };
+         { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
+@@ -54,8 +51,6 @@ void WpftWriterFilterTest::test()
  
-     doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
--    doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
-     doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
-     doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional);
-     doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
+     doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
+            "/writerperfect/qa/unit/data/writer/libabw/");
+-    doTest("org.libreoffice.comp.Writer.EBookImportFilter",
+-           "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
+     doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
+            "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
+     doTest("com.sun.star.comp.Writer.MWAWImportFilter",
 diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
-index 8ab4366..2720023 100644
+index 8ab436634052..2720023baedf 100644
 --- a/writerperfect/source/writer/wpftwriter.component
 +++ b/writerperfect/source/writer/wpftwriter.component
 @@ -38,11 +38,6 @@
@@ -140,5 +141,5 @@ index 8ab4366..2720023 100644
        constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
      <service name="com.sun.star.document.ExtendedTypeDetection"/>
 -- 
-2.14.1
+2.25.1
 

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/
 
@@ -112,6 +112,7 @@ BuildRequires: libtool-ltdl-devel
 BuildRequires: make
 BuildRequires: mariadb-connector-c-devel
 BuildRequires: perl(Digest::MD5)
+BuildRequires: perl(base)
 %if 0%{?fedora}
 BuildRequires: glibc-all-langpacks
 BuildRequires: libappstream-glib
@@ -2224,6 +2225,10 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Thu Sep 03 2020 Merlin Mathesius <mmathesi@redhat.com> - 1:7.0.1.2-2
+- Rebase RHEL patch to disable libe-book support to libreoffice-7.0
+- Add BR perl(base)
+
 * Tue Sep 01 2020 Caolán McNamara <caolanm@redhat.com> - 1:7.0.1.2-1
 - 7.0.1 RC2