drop rhel-6-related stuff

0001-disable-failing-test-on-rhel-6.patch

@@ -1,38 +0,0 @@
-From 61deda9f7191e14e54be1b79a721ca73f42d5574 Mon Sep 17 00:00:00 2001
-From: rpmbuild <rpmbuild@fedoraproject.org>
-Date: Sat, 31 May 2014 10:19:14 +0200
-Subject: [PATCH] disable failing test on rhel-6
-
----
- dbaccess/Module_dbaccess.mk | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
-index 824f3f5..3214658 100644
---- a/dbaccess/Module_dbaccess.mk
-+++ b/dbaccess/Module_dbaccess.mk
-@@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
- 
- ifeq ($(ENABLE_JAVA),TRUE)
- $(eval $(call gb_Module_add_check_targets,dbaccess,\
--    CppunitTest_dbaccess_hsqldb_test \
- ))
- endif
- 
-diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
-index 9c30697..c5fbcca 100644
---- a/writerperfect/Module_writerperfect.mk
-+++ b/writerperfect/Module_writerperfect.mk
-@@ -31,12 +31,4 @@ $(eval $(call gb_Module_add_check_targets,writerperfect,\
- 	CppunitTest_writerperfect_stream \
- ))
- 
--$(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
--	CppunitTest_writerperfect_calc \
--	CppunitTest_writerperfect_draw \
--	CppunitTest_writerperfect_impress \
--	CppunitTest_writerperfect_writer \
--	StaticLibrary_writerperfect_importtestbase \
--))
--
- # vim: set noet sw=4 ts=4:

libreoffice-rhel6gcj.patch

@@ -1,39 +0,0 @@
-From 5ae1c74d453150a54a4b377d29a9228acf3e61fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 20 Feb 2014 11:35:28 +0000
-Subject: [PATCH] gcj fixes
-
-Change-Id: I99fe963bb2ca413b323c44a77ad2f48dd7c477f4
----
- odk/CustomTarget_javadoc.mk      |  1 -
- odk/Package_javadoc.mk           | 61 ----------------------------------------
- scp2/source/ooo/common_brand.scp |  1 +
- 3 files changed, 1 insertion(+), 62 deletions(-)
-
-diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
-index c5e3e67..8bd18b4 100644
---- a/odk/CustomTarget_javadoc.mk
-+++ b/odk/CustomTarget_javadoc.mk
-@@ -41,7 +41,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
- 		-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
- 		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
- 		$(odk_JAVAPACKAGES) \
--		$(if $(JAVADOCISGJDOC),,-notimestamp) \
- 		> $@)
- 
- # vim: set noet sw=4 ts=4:
-diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
-index 2498822..d459997 100644
---- a/scp2/source/ooo/common_brand.scp
-+++ b/scp2/source/ooo/common_brand.scp
-@@ -1239,6 +1239,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
-     Section = "Bootstrap";
-     Key = "URE_MORE_JAVA_CLASSPATH_URLS";
-     Value = "";
-+    ValueList1 = "$ORIGIN/../ure-link/lib";
- #ifdef SYSTEM_HSQLDB
-     ValueList1 = HSQLDB_JAR;
- #endif
--- 
-1.8.5.3
-

libreoffice-rhel6glib.patch

@@ -1,62 +0,0 @@
-From cb7ad37354e6e189d540d14450cf733942b95da0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 20 Feb 2014 11:37:33 +0000
-Subject: [PATCH] rhel6 glib
-
-Change-Id: I75ccb56e8eea821bc00dcf14e9852b929a87163e
----
- Repository.mk               | 1 -
- postprocess/Rdb_services.mk | 1 -
- shell/Module_shell.mk       | 8 --------
- 3 files changed, 10 deletions(-)
- mode change 100755 => 100644 postprocess/Rdb_services.mk
-
-diff --git a/Repository.mk b/Repository.mk
-index 3977ac3..14b01ff 100644
---- a/Repository.mk
-+++ b/Repository.mk
-@@ -193,5 +193,4 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
- 	$(if $(ENABLE_GTK3),vclplug_gtk3) \
- 	$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
--	$(if $(ENABLE_GIO),losessioninstall) \
- 	$(if $(ENABLE_GIO),ucpgio1) \
- ))
-diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
-old mode 100755
-new mode 100644
-index b72f4abc..90e4711
---- a/postprocess/Rdb_services.mk
-+++ b/postprocess/Rdb_services.mk
-@@ -193,5 +193,4 @@ $(eval $(call gb_Rdb_add_components,services,\
- 	) \
- 	$(if $(ENABLE_GIO), \
--		shell/source/sessioninstall/losessioninstall \
- 		ucb/source/ucp/gio/ucpgio \
- 	) \
-diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
-index 3461381..eb74104 100644
---- a/shell/Module_shell.mk
-+++ b/shell/Module_shell.mk
-@@ -14,22 +14,6 @@ $(eval $(call gb_Module_add_targets,shell,\
- 	Library_localebe \
- ))
- 
--ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
--ifeq ($(ENABLE_GIO),TRUE)
--$(eval $(call gb_Module_add_targets,shell,\
--	Library_losessioninstall \
--))
--endif
--endif
--
--ifeq ($(OS),SOLARIS)
--ifeq ($(ENABLE_GIO),TRUE)
--$(eval $(call gb_Module_add_targets,shell,\
--    Library_losessioninstall \
--))
--endif
--endif
--
- ifeq ($(ENABLE_KDE4),TRUE)
- $(eval $(call gb_Module_add_targets,shell,\
- 	Library_kde4be \

libreoffice-rhel6langs.patch

@@ -1,33 +0,0 @@
-From 5a02450a2af673dcdfca32389abc9d801fe55380 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 20 Feb 2014 11:37:07 +0000
-Subject: [PATCH] rhel-6 langs
-
-Change-Id: I79a0256fd1c707770cbfbeb03002f96d6f793350
----
- solenv/inc/langlist.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
-index 5d2448b..95c44d9 100644
---- a/solenv/inc/langlist.mk
-+++ b/solenv/inc/langlist.mk
-@@ -79,6 +79,7 @@ ml \
- mn \
- mni \
- mr \
-+ms \
- my \
- nb \
- ne \
-@@ -120,6 +121,7 @@ ts \
- tt \
- ug \
- uk \
-+ur \
- uz \
- ve \
- vi \
--- 
-1.8.5.3
-

libreoffice-rhel6poppler.patch

@@ -1,31 +0,0 @@
-From 6fa0780b933babbb3c5f16e0bb865eaf141b6412 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 20 Feb 2014 11:36:38 +0000
-Subject: [PATCH] poppler fixes
-
-Change-Id: Iaad3d6ba494a00e7581c5d7a35ec3ec5f57134dc
----
- configure.ac                                          | 10 ----------
- sdext/Module_sdext.mk                                 |  5 -----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  4 +++-
- 3 files changed, 3 insertions(+), 16 deletions(-)
-
-diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
-index f706e9c..94baf45 100644
---- a/sdext/Module_sdext.mk
-+++ b/sdext/Module_sdext.mk
-@@ -26,11 +26,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
-     StaticLibrary_pdfimport_s \
- ))
- 
--$(eval $(call gb_Module_add_check_targets,sdext,\
--    CppunitTest_sdext_pdfimport \
--    Executable_pdf2xml \
--    Executable_pdfunzip \
--))
- endif
- 
- # vim:set noet sw=4 ts=4:
--- 
-1.9.0
-

libreoffice.spec

@@ -70,13 +70,10 @@ Source5:        %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
 Source6:        %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 Source7:        %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 Source8:        %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
 #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose
 #backwards compatability.
 Source9:        %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 %global bundling_options %{?bundling_options} --without-system-hsqldb
-%endif
 
 %if 0%{?rhel}
 Source10:       %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
@@ -85,36 +82,21 @@ Source12:       %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-lib
 Source13:       %{external_url}/liborcus-0.9.2.tar.gz
 # system mdds 0.10.3 causes a crash in sc_ucalc unit test
 Source14:       %{external_url}/mdds_0.12.1.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-glew --without-system-glm --without-system-orcus --without-system-mdds
+Source15:       %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
-%if 0%{?rhel} < 7
+Source16:       %{external_url}/libcdr-0.1.1.tar.bz2
-Source15:       %{external_url}/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
+Source17:       %{external_url}/libwpg-0.3.0.tar.bz2
-Source16:       %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
+Source18:       %{external_url}/libwpd-0.10.0.tar.bz2
-Source17:       %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
+Source19:       %{external_url}/libwps-0.4.2.tar.bz2
-Source18:       %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
+Source20:       %{external_url}/libvisio-0.1.3.tar.bz2
-Source19:       %{external_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+Source21:       %{external_url}/libmspub-0.1.2.tar.bz2
-Source20:       %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+Source22:       %{external_url}/libodfgen-0.1.5.tar.bz2
-Source21:       %{external_url}/lcms2-2.6.tar.gz
+Source23:       %{external_url}/libmwaw-0.3.6.tar.bz2
-Source22:       %{external_url}/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
+Source24:       %{external_url}/libetonyek-0.1.5.tar.bz2
-Source23:       %{external_url}/boost_1_59_0.tar.bz2
+Source25:       %{external_url}/libfreehand-0.1.1.tar.bz2
-Source24:       %{external_url}/harfbuzz-0.9.40.tar.bz2
+Source26:       %{external_url}/libabw-0.1.1.tar.bz2
-Source25:       %{external_url}/language-subtag-registry-2015-08-04.tar.bz2
+Source27:       %{external_url}/librevenge-0.0.2.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-mythes --without-system-redland --without-system-libexttextcat --without-system-clucene --without-system-lcms2 --without-system-liblangtag --without-system-boost --without-system-harfbuzz
+Source28:       %{external_url}/libpagemaker-0.0.2.tar.bz2
-%endif
+%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-glew --without-system-glm --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libabw --without-system-librevenge --without-system-libpagemaker
-Source26:       %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
-Source27:       %{external_url}/libcdr-0.1.1.tar.bz2
-Source28:       %{external_url}/libwpg-0.3.0.tar.bz2
-Source29:       %{external_url}/libwpd-0.10.0.tar.bz2
-Source30:       %{external_url}/libwps-0.4.2.tar.bz2
-Source31:       %{external_url}/libvisio-0.1.3.tar.bz2
-Source32:       %{external_url}/libmspub-0.1.2.tar.bz2
-Source33:       %{external_url}/libodfgen-0.1.5.tar.bz2
-Source34:       %{external_url}/libmwaw-0.3.6.tar.bz2
-Source35:       %{external_url}/libetonyek-0.1.5.tar.bz2
-Source36:       %{external_url}/libfreehand-0.1.1.tar.bz2
-Source37:       %{external_url}/libabw-0.1.1.tar.bz2
-Source38:       %{external_url}/librevenge-0.0.2.tar.bz2
-Source39:       %{external_url}/libpagemaker-0.0.2.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libabw --without-system-librevenge --without-system-libpagemaker
 %endif
 
 %if 0%{?fedora}
@@ -136,10 +118,6 @@ BuildRequires: automake
 BuildRequires: bc
 BuildRequires: binutils
 BuildRequires: bison
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: devtoolset-2-binutils
-BuildRequires: devtoolset-2-gcc-c++
-%endif
 BuildRequires: desktop-file-utils
 BuildRequires: doxygen
 BuildRequires: findutils
@@ -148,9 +126,7 @@ BuildRequires: gcc-c++
 BuildRequires: gdb
 BuildRequires: git
 BuildRequires: gperf
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: icu
-%endif
 BuildRequires: make
 BuildRequires: perl(Archive::Zip)
 BuildRequires: perl(Digest::MD5)
@@ -162,37 +138,53 @@ BuildRequires: zip
 
 # libs / headers - common
 BuildRequires: %{libo_python}-devel
+BuildRequires: boost-devel
 BuildRequires: cups-devel
 BuildRequires: expat-devel
 BuildRequires: fontpackages-devel
 BuildRequires: hyphen-devel
+BuildRequires: libicu-devel
+BuildRequires: libjpeg-turbo-devel
 BuildRequires: lpsolve-devel
 BuildRequires: openldap-devel
 BuildRequires: pam-devel
+BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(cppunit)
 BuildRequires: pkgconfig(dbus-glib-1)
 BuildRequires: pkgconfig(evolution-data-server-1.2)
 BuildRequires: pkgconfig(freetype2)
 BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(graphite2)
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(harfbuzz)
 BuildRequires: pkgconfig(hunspell)
 BuildRequires: pkgconfig(ice)
+BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(libclucene-core)
 BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(libexttextcat)
 BuildRequires: pkgconfig(libidn)
+BuildRequires: pkgconfig(liblangtag)
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(libxslt)
+BuildRequires: pkgconfig(mythes)
 BuildRequires: pkgconfig(neon)
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(poppler)
+BuildRequires: pkgconfig(poppler-cpp)
 BuildRequires: pkgconfig(redland)
 BuildRequires: pkgconfig(sane-backends)
 BuildRequires: pkgconfig(xext)
 BuildRequires: pkgconfig(xinerama)
 BuildRequires: pkgconfig(xt)
 BuildRequires: pkgconfig(zlib)
+BuildRequires: postgresql-devel
 BuildRequires: unixODBC-devel
 BuildRequires: vigra-devel
 
+
 # libs / headers - conditional
 %if 0%{?fedora}
 BuildRequires: firebird-devel
@@ -224,54 +216,12 @@ BuildRequires: pkgconfig(libwps-0.4)
 BuildRequires: pkgconfig(mdds) >= 0.12.0
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: boost-devel
-BuildRequires: libicu-devel
-BuildRequires: pkgconfig(graphite2)
-BuildRequires: pkgconfig(harfbuzz)
-BuildRequires: pkgconfig(lcms2)
-BuildRequires: pkgconfig(libclucene-core)
-BuildRequires: pkgconfig(libexttextcat)
-BuildRequires: pkgconfig(liblangtag)
-BuildRequires: pkgconfig(mythes)
-BuildRequires: pkgconfig(poppler-cpp)
-BuildRequires: postgresql-devel
-%endif
-
-# libs / headers - special cases
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel
-%else
-BuildRequires: pkgconfig(gstreamer-1.0)
-BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: libjpeg-turbo-devel
-%else
-BuildRequires: libjpeg-devel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: pkgconfig(bluez)
-%else
-%ifnarch s390 s390x
-BuildRequires: pkgconfig(bluez)
-%endif
-%endif
-
 # java stuff
 BuildRequires: ant
 BuildRequires: bsh
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: hsqldb
-%endif
 BuildRequires: java-devel
 BuildRequires: jakarta-commons-httpclient
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: junit
-%endif
 BuildRequires: pentaho-reporting-flow-engine
 
 # fonts needed for unit tests
@@ -294,42 +244,30 @@ Patch1:  openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
 # not upstreamed
 Patch2:  libreoffice-installfix.patch
 %if 0%{?rhel}
-%if 0%{?rhel} < 7
-# not upstreamed
-Patch4: libreoffice-rhel6gcj.patch
-# not upstreamed
-Patch5: libreoffice-rhel6poppler.patch
-# not upstreamed
-Patch6: libreoffice-rhel6langs.patch
-# not upstreamed
-Patch7: libreoffice-rhel6glib.patch
-# not upstreamed
-Patch8: 0001-disable-failing-test-on-rhel-6.patch
-%endif
 # not upstreamed
-Patch10: 0001-disable-libe-book-support.patch
+Patch3: 0001-disable-libe-book-support.patch
 %endif
 # not upstreamed
-Patch12: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
+Patch4: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
 # not upstreamed
-Patch13: 0001-disable-firebird-unit-test.patch
+Patch5: 0001-disable-firebird-unit-test.patch
 # not upstreamed
-Patch14: 0001-never-run-autogen.sh.patch
+Patch6: 0001-never-run-autogen.sh.patch
 # not upstreamed
-Patch15: 0001-add-X-TryExec-entries-to-desktop-files.patch
+Patch7: 0001-add-X-TryExec-entries-to-desktop-files.patch
 # not upstreamed
-Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
+Patch8: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
 # backport from master
-Patch17: 0001-Resolves-rhbz-1285380-get-menus-working-under-waylan.patch
+Patch9: 0001-Resolves-rhbz-1285380-get-menus-working-under-waylan.patch
-Patch18: 0001-gtk3-wayland-wrong-dialog-sizes.patch
+Patch10: 0001-gtk3-wayland-wrong-dialog-sizes.patch
-Patch19: 0001-fix-powerpc-build.patch
+Patch11: 0001-fix-powerpc-build.patch
-Patch20: 0001-update-the-appstream-files-to-most-recent-version-of.patch
+Patch12: 0001-update-the-appstream-files-to-most-recent-version-of.patch
-Patch21: 0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch
+Patch13: 0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch
-Patch22: 0001-tdf-96246-Make-pRenderingArguments-nullable.patch
+Patch14: 0001-tdf-96246-Make-pRenderingArguments-nullable.patch
-Patch23: 0001-tdf-96250-desktop-empty-str-is-the-same-as-0-str-in-.patch
+Patch15: 0001-tdf-96250-desktop-empty-str-is-the-same-as-0-str-in-.patch
-Patch24: 0001-tdf-96316-Decouple-view-only-editable-modes.patch
+Patch16: 0001-tdf-96316-Decouple-view-only-editable-modes.patch
-Patch25: 0002-tdf-96318-Add-searching-API.patch
+Patch17: 0002-tdf-96318-Add-searching-API.patch
-Patch26: 0003-lokdocview-Set-a-default-path-for-LOK-init.patch
+Patch18: 0003-lokdocview-Set-a-default-path-for-LOK-init.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -338,19 +276,10 @@ Patch26: 0003-lokdocview-Set-a-default-path-for-LOK-init.patch
 
 # rhbz#1085420 make sure we do not provide bundled libraries
 %if 0%{?rhel}
-%global libo_bundled_libs_common GLEW
+%global libo_bundled_libs_filter ^libGLEW\\.so.*$
-%if 0%{?rhel} < 7
-# redland libs are already suffixed -> no need to filter them too
-%global libo_bundled_libs_filter /^lib\\(clucene\\|lcms2\\|%libo_bundled_libs_common\\)\\.so.*$/d
-%filter_from_provides %{libo_bundled_libs_filter}
-%filter_from_requires %{libo_bundled_libs_filter}
-%filter_setup
-%else
-%global libo_bundled_libs_filter ^lib\\(%libo_bundled_libs_common\\)\\.so.*$
 %global __provides_exclude %{libo_bundled_libs_filter}
 %global __requires_exclude %{libo_bundled_libs_filter}
 %endif
-%endif
 
 %description
 LibreOffice is an Open Source, community-developed, office productivity suite.
@@ -386,13 +315,9 @@ Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberatio
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts
 Requires: hyphen-en, hyphen >= 2.4, autocorr-en
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires: hunspell-en
-%else
 # rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0
 Requires: java-headless >= 1:1.6
 Requires: hunspell-en-US
-%endif
 Requires(pre):    gtk2 >= 2.9.4
 Requires(post):   gtk2 >= 2.9.4
 Requires(preun):  gtk2 >= 2.9.4
@@ -411,14 +336,6 @@ Obsoletes: openoffice.org-testtools < 1:3.3.1
 Obsoletes: libreoffice-testtools < 1:3.4.99.1
 Obsoletes: autocorr-eu < 1:4.0.1.2
 Provides: libreoffice-headless = %{epoch}:%{version}-%{release}
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-core = 1:3.3.0
-Provides: openoffice.org-core%{?_isa} = 1:3.3.0
-Provides: openoffice.org-brand = 1:3.3.0, broffice.org-brand = 1:3.3.0
-Provides: openoffice.org-brand%{?_isa} = 1:3.3.0, broffice.org-brand%{?_isa} = 1:3.3.0
-Provides: openoffice.org-headless = 1:3.3.0
-Provides: openoffice.org-headless%{?_isa} = 1:3.3.0
-%endif
 
 %description core
 The shared core libraries and support files for LibreOffice.
@@ -430,10 +347,6 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{libo_python}
 Obsoletes: openoffice.org-pyuno < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-pyuno = 1:3.3.0
-Provides: openoffice.org-pyuno%{?_isa} = 1:3.3.0
-%endif
 
 %description pyuno
 Python bindings for the LibreOffice UNO component model. Allows scripts both
@@ -445,9 +358,6 @@ Summary: Database front-end for LibreOffice
 Group: Applications/Productivity
 Requires: pentaho-reporting-flow-engine
 Requires: postgresql-jdbc
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires:  hsqldb
-%endif
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-calc = %{epoch}:%{version}-%{release}
 Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
@@ -456,14 +366,6 @@ Obsoletes: %{name}-report-builder < 1:4.1.0.0
 Obsoletes: openoffice.org-base-core < 1:3.3.1
 Obsoletes: openoffice.org-base < 1:3.3.1, broffice.org-base < 1:3.3.1
 Obsoletes: openoffice.org-report-builder < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-base-core = 1:3.3.0
-Provides: openoffice.org-base-core%{?_isa} = 1:3.3.0
-Provides: openoffice.org-base = 1:3.3.0, broffice.org-base = 1:3.3.0
-Provides: openoffice.org-base%{?_isa} = 1:3.3.0, broffice.org-base%{?_isa} = 1:3.3.0
-Provides: openoffice.org-report-builder = 1:3.3.0
-Provides: openoffice.org-report-builder%{?_isa} = 1:3.3.0
-%endif
 
 %description base
 GUI database front-end for LibreOffice. Allows creation and management of 
@@ -475,10 +377,6 @@ Group: Development/Libraries
 Requires: bsh
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-bsh < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-bsh = 1:3.3.0
-Provides: openoffice.org-bsh%{?_isa} = 1:3.3.0
-%endif
 
 %description bsh
 Support BeanShell scripts in LibreOffice.
@@ -498,10 +396,6 @@ Summary: JavaScript support for LibreOffice
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-rhino < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-rhino = 1:3.3.0
-Provides: openoffice.org-rhino%{?_isa} = 1:3.3.0
-%endif
 
 %description rhino
 Support JavaScript scripts in LibreOffice.
@@ -509,21 +403,12 @@ Support JavaScript scripts in LibreOffice.
 %package wiki-publisher
 Summary: Create Wiki articles on MediaWiki servers with LibreOffice
 Group: Applications/Productivity
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires: jakarta-commons-codec, jakarta-commons-httpclient
-Requires: jakarta-commons-lang, jakarta-commons-logging
-%else
 Requires: apache-commons-codec, jakarta-commons-httpclient
 Requires: apache-commons-lang, apache-commons-logging
-%endif
 Requires: %{name}-writer = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-wiki-publisher < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-wiki-publisher = 1:3.3.0
-Provides: openoffice.org-wiki-publisher%{?_isa} = 1:3.3.0
-%endif
 
 %description wiki-publisher
 The Wiki Publisher enables you to create Wiki articles on MediaWiki servers
@@ -548,10 +433,6 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-impress = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-ogltrans < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-ogltrans = 1:3.3.0
-Provides: openoffice.org-ogltrans%{?_isa} = 1:3.3.0
-%endif
 
 %description ogltrans
 OpenGL Transitions enable 3D slide transitions to be used in LibreOffice.
@@ -564,10 +445,6 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-draw = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-pdfimport < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-pdfimport = 1:3.3.0
-Provides: openoffice.org-pdfimport%{?_isa} = 1:3.3.0
-%endif
 
 %description pdfimport
 The PDF Importer imports PDF into drawing documents to preserve layout
@@ -580,10 +457,6 @@ Requires: fontpackages-filesystem
 Obsoletes: openoffice.org-fonts < 1:3.3.1
 Obsoletes: openoffice.org-opensymbol-fonts < 1:3.3.1
 BuildArch: noarch
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-fonts = 1:3.3.0
-Provides: openoffice.org-opensymbol-fonts = 1:3.3.0
-%endif
 
 %description %{fontname}-fonts
 A dingbats font, OpenSymbol, suitable for use by LibreOffice for bullets and
@@ -597,12 +470,6 @@ Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-writer-core < 1:3.3.1
 Obsoletes: openoffice.org-writer < 1:3.3.1, broffice.org-writer < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-writer-core = 1:3.3.0
-Provides: openoffice.org-writer-core%{?_isa} = 1:3.3.0
-Provides: openoffice.org-writer = 1:3.3.0, broffice.org-writer = 1:3.3.0
-Provides: openoffice.org-writer%{?_isa} = 1:3.3.0, broffice.org-writer%{?_isa} = 1:3.3.0
-%endif
 
 %description writer
 The LibreOffice Word Processor application.
@@ -613,10 +480,6 @@ Group: Applications/Productivity
 Requires: %{name}-writer = %{epoch}:%{version}-%{release}
 Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-emailmerge < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-emailmerge = 1:3.3.0
-Provides: openoffice.org-emailmerge%{?_isa} = 1:3.3.0
-%endif
 
 %description emailmerge
 Enables the LibreOffice writer module to mail-merge to email.
@@ -629,12 +492,6 @@ Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-calc-core < 1:3.3.1
 Obsoletes: openoffice.org-calc < 1:3.3.1, broffice.org-calc < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-calc-core = 1:3.3.0
-Provides: openoffice.org-calc-core%{?_isa} = 1:3.3.0
-Provides: openoffice.org-calc = 1:3.3.0, broffice.org-calc = 1:3.3.0
-Provides: openoffice.org-calc%{?_isa} = 1:3.3.0, broffice.org-calc%{?_isa} = 1:3.3.0
-%endif
 
 %description calc
 The LibreOffice Spreadsheet application.
@@ -649,12 +506,6 @@ Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-draw-core < 1:3.3.1
 Obsoletes: openoffice.org-draw < 1:3.3.1, broffice.org-draw < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-draw-core = 1:3.3.0
-Provides: openoffice.org-draw-core%{?_isa} = 1:3.3.0
-Provides: openoffice.org-draw = 1:3.3.0, broffice.org-draw = 1:3.3.0
-Provides: openoffice.org-draw%{?_isa} = 1:3.3.0, broffice.org-draw%{?_isa} = 1:3.3.0
-%endif
 
 %description draw
 The LibreOffice Drawing Application.
@@ -673,16 +524,6 @@ Obsoletes: openoffice.org-presentation-minimizer < 1:3.3.1
 Obsoletes: openoffice.org-presenter-screen < 1:3.3.1
 Provides: %{name}-presentation-minimizer%{?_isa} = %{epoch}:%{version}-%{release}
 Provides: %{name}-presenter-screen%{?_isa} = %{epoch}:%{version}-%{release}
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-impress-core = 1:3.3.0
-Provides: openoffice.org-impress-core%{?_isa} = 1:3.3.0
-Provides: openoffice.org-impress = 1:3.3.0, broffice.org-impress = 1:3.3.0
-Provides: openoffice.org-impress%{?_isa} = 1:3.3.0, broffice.org-impress%{?_isa} = 1:3.3.0
-Provides: openoffice.org-presentation-minimizer = 1:3.3.0
-Provides: openoffice.org-presentation-minimizer%{?_isa} = 1:3.3.0
-Provides: openoffice.org-presenter-screen = 1:3.3.0
-Provides: openoffice.org-presenter-screen%{?_isa} = 1:3.3.0
-%endif
 
 %description impress
 The LibreOffice Presentation Application.
@@ -695,12 +536,6 @@ Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-math-core < 1:3.3.1
 Obsoletes: openoffice.org-math < 1:3.3.1, broffice.org-math < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-math-core = 1:3.3.0
-Provides: openoffice.org-math-core%{?_isa} = 1:3.3.0
-Provides: openoffice.org-math = 1:3.3.0, broffice.org-math = 1:3.3.0
-Provides: openoffice.org-math%{?_isa} = 1:3.3.0, broffice.org-math%{?_isa} = 1:3.3.0
-%endif
 
 %description math 
 The LibreOffice Equation Editor Application.
@@ -711,10 +546,6 @@ Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-graphicfilter < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-graphicfilter = 1:3.3.0
-Provides: openoffice.org-graphicfilter%{?_isa} = 1:3.3.0
-%endif
 
 %description graphicfilter
 The graphicfilter module for LibreOffice provides graphic filters, e.g. svg and
@@ -725,16 +556,11 @@ Summary: Optional xsltfilter module for LibreOffice
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-xsltfilter < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-xsltfilter = 1:3.3.0
-Provides: openoffice.org-xsltfilter%{?_isa} = 1:3.3.0
-%endif
 
 %description xsltfilter
 The xsltfilter module for LibreOffice, provides additional docbook and
 xhtml export transforms. Install this to enable docbook export.
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %package postgresql
 Summary: PostgreSQL connector for LibreOffice
 Group: Applications/Productivity
@@ -746,7 +572,6 @@ Requires: postgresql-libs
 %description postgresql
 A PostgreSQL connector for the database front-end for LibreOffice. Allows
 creation and management of PostgreSQL databases through a GUI.
-%endif
 
 %package ure
 Summary: UNO Runtime Environment
@@ -757,10 +582,6 @@ Group: Development/Libraries
 %endif
 Requires: unzip, libjvm.so%{?mark64}
 Obsoletes: openoffice.org-ure < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-ure = 1:3.3.0
-Provides: openoffice.org-ure%{?_isa} = 1:3.3.0
-%endif
 
 %description ure
 UNO is the component model of LibreOffice. UNO offers interoperability between
@@ -777,10 +598,6 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: unzip, java-devel
 Obsoletes: openoffice.org-sdk < 1:3.3.1, openoffice.org-devel < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-sdk = 1:3.3.0, openoffice.org-devel = 1:3.3.0
-Provides: openoffice.org-sdk%{?_isa} = 1:3.3.0, openoffice.org-devel%{?_isa} = 1:3.3.0
-%endif
 
 %description sdk
 The LibreOffice SDK is an add-on for the LibreOffice office suite. It provides
@@ -793,10 +610,6 @@ Summary: Software Development Kit documentation for LibreOffice
 Group: Documentation
 Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-sdk-doc < 1:3.3.1
-%if 0%{?rhel} && 0%{?rhel} < 7
-Provides: openoffice.org-sdk-doc = 1:3.3.0
-Provides: openoffice.org-sdk-doc%{?_isa} = 1:3.3.0
-%endif
 
 %description sdk-doc
 This provides documentation for programming using the LibreOffice APIs
@@ -1037,9 +850,7 @@ Rules for auto-correcting common %{langname} typing errors. \
 %langpack -l as -n Assamese -F -H -Y -o as_IN -w as_IN
 %langpack -l bg -n Bulgarian -F -H -Y -M -A -T -X -o bg_BG -V -w bg_BG
 %langpack -l bn -n Bengali -F -H -Y -T -O -v bn_IN -W
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %langpack -l br -n Breton -F -H
-%endif
 %langpack -l ca -n Catalan -F -H -Y -M -A -T -o ca_ES -V -w ca_ES -X
 %langpack -l cs -n Czech -F -H -Y -M -A -T -X -o cs_CZ -V -w cs_CZ
 %langpack -l cy -n Welsh -F -H -Y -o cy_GB -V -w cy_GB
@@ -1050,14 +861,8 @@ Rules for auto-correcting common %{langname} typing errors. \
 %langpack -l es -n Spanish -F -H -Y -M -A -T -X -O -W
 %langpack -l et -n Estonian -F -H -Y -T -o et_EE -V -w et_EE
 %langpack -l eu -n Basque -F -H -Y -T -o eu_ES -V -w eu_ES
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %langpack -l fa -n Farsi -A -H -Y -s ctl -X
-%endif
-%if 0%{?rhel} && 0%{?rhel} < 7
-%langpack -l fi -n Finnish -F -A -T -o fi_FI -V -w fi_FI -X
-%else
 %langpack -l fi -n Finnish -F -r libreoffice-voikko -A -T -o fi_FI -V -w fi_FI -X
-%endif
 %langpack -l fr -n French -F -H -Y -M -A -T -X -O -W
 %langpack -l ga -n Irish -F -H -Y -M -A -o ga_IE -w ga_IE
 %langpack -l gl -n Galician -F -H -Y -T -o gl_ES -V -w gl_ES
@@ -1068,19 +873,12 @@ Rules for auto-correcting common %{langname} typing errors. \
 %langpack -l hu -n Hungarian -F -H -Y -M -A -T -X -o hu_HU -V -w hu_HU
 %langpack -l it -n Italian -F -H -Y -M -A -T -X -O -W
 %langpack -l ja -n Japanese -F -A -s cjk -T -X -o ja_JP -V -w ja_JP
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %langpack -l kk -n Kazakh -F -H
-%endif
 %langpack -l kn -n Kannada -F -H -Y -o kn_IN -w ka_IN
 %langpack -l ko -n Korean -F -H -A -s cjk -T -X -o ko_KR -V -w ko_KR
 %langpack -l lt -n Lithuanian -F -H -Y -A -o lt_LT -V -w lt_LT -X
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %langpack -l lv -n Latvian -F -H -Y -M
-%endif
 %langpack -l mai -n Maithili -F -o mai_IN
-%if 0%{?rhel} && 0%{?rhel} < 7
-%langpack -l ms -n Malay -F -H -o ms_MY
-%endif
 %langpack -l ml -n Malayalam -F -H -Y -o ml_IN -w ml_IN
 %langpack -l mr -n Marathi -F -H -Y -o mr_IN -w mr_IN
 %langpack -l nb -n Bokmal -F -H -Y -M -T -o nb_NO -V -w nb_NO
@@ -1098,9 +896,7 @@ Rules for auto-correcting common %{langname} typing errors. \
 %langpack -l pt-PT -n Portuguese -f pt -h pt -y pt -m pt -a pt -p pt_PT -T -L pt -x pt -o pt_PT -v pt -W
 %langpack -l ro -n Romanian -A -F -H -Y -M -O -X
 %langpack -l ru -n Russian -F -H -Y -M -A -T -X -O -W
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %langpack -l si -n Sinhalese -F -H -S ctl -T -O
-%endif
 %langpack -l sk -n Slovak -F -H -Y -M -A -T -X -o sk_SK -V -w sk_SK
 %langpack -l sl -n Slovenian -F -H -Y -M -A -T -X -o sl_SI -V -w sl_SI
 %{baseinstdir}/share/wordbook/sl.dic
@@ -1118,9 +914,6 @@ Rules for auto-correcting common %{langname} typing errors. \
 %langpack -l tr -n Turkish -F -A -T -X -o tr_TR -V -W
 %langpack -l ts -n Tsonga -F -H -o ts_ZA -V -w ts_ZA
 %langpack -l uk -n Ukrainian -F -H -Y -M -T -O
-%if 0%{?rhel} && 0%{?rhel} < 7
-%langpack -l ur -n Urdu -F -H -O -W
-%endif
 %langpack -l ve -n Venda -F -H -o ve_ZA
 %langpack -l xh -n Xhosa -F -H -o xh_ZA
 %define langpack_lang Simplified Chinese
@@ -1206,16 +999,6 @@ git commit -q -a -m 'add Red Hat colors to palette'
 # apply patches
 git am %{patches}
 
-%if 0%{?rhel} && 0%{?rhel} < 7
-cp -r translations/source/en-GB translations/source/ms
-cp -r translations/source/en-GB translations/source/ur
-git add -A
-git commit -q -a -m 'fix translations'
-
-sed -i -e /CppunitTest_lotuswordpro_test_lotuswordpro/d lotuswordpro/Module_lotuswordpro.mk
-git commit -q -a -m 'disable hanging test'
-%endif
-
 sed -i -e /CppunitTest_sw_ooxmlimport/d sw/Module_sw.mk
 # fails on i686
 sed -i -e /CppunitTest_oox_vba_compression/d oox/Module_oox.mk
@@ -1263,21 +1046,9 @@ export CFLAGS=$ARCH_FLAGS
 export CXXFLAGS=$ARCH_FLAGS
 
 %if 0%{?rhel}
-%if 0%{?rhel} < 7
+%define distrooptions --disable-eot --disable-gltf --disable-firebird-sdbc --enable-python=system
-%global devtoolset_path /opt/rh/devtoolset-2/root
-# make segfaults on parallel build
-%define distrooptions --disable-eot --disable-gltf --disable-firebird-sdbc --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer-1-0 --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1
-export PATH=%{devtoolset_path}%{_bindir}:$PATH
-export LD_LIBRARY_PATH=%{devtoolset_path}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-
-%ifarch s390 s390x
-%define archoptions --disable-sdremote-bluetooth
-%endif
-%else # rhel7
-%define distrooptions --disable-eot --disable-gltf --disable-firebird-sdbc --disable-gstreamer-0-10 --enable-gstreamer-1-0 --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
-%endif
 %else # fedora
-%define distrooptions --enable-eot --enable-gtk3 --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer-1-0 --with-system-mythes --with-system-opencollada %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
+%define distrooptions --enable-eot --enable-gtk3 --enable-kde4 --with-system-opencollada --with-system-ucpp
 export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser'
 export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser'
 %endif
@@ -1288,13 +1059,8 @@ export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOL
 
 %if ! 0%{libo_use_python3}
 export PYTHON=%{_bindir}/python
-%if 0%{?fedora} || 0%{?rhel} >= 7
 export PYTHON_CFLAGS=`pkg-config --cflags python`
 export PYTHON_LIBS=`pkg-config --libs python`
-%else
-export PYTHON_CFLAGS=`python-config --cflags python`
-export PYTHON_LIBS=`python-config --libs python`
-%endif
 %endif
 
 # %%if 0%%{?rhel} && 0%%{?rhel} < 7
@@ -1308,6 +1074,7 @@ touch autogen.lastrun
 %configure \
  %vendoroption \
  %{?with_lang} \
+ %{?_smp_mflags:--with-parallelism=%{_smp_mflags}} \
  --disable-coinmp \
  --disable-fetch-external \
  --disable-openssl \
@@ -1324,7 +1091,6 @@ touch autogen.lastrun
  --with-help \
  --with-system-dicts \
  --with-system-libs \
- --with-system-ucpp \
  --without-fonts \
  --without-system-npapi-headers \
  --with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \
@@ -1535,11 +1301,6 @@ chmod a+x libreoffice
 ln -s %{baseinstdir}/program/soffice soffice
 # rhbz#499474 provide a /usr/bin/openoffice.org for backwards compat
 ln -s libreoffice openoffice.org
-%if 0%{?rhel} && 0%{?rhel} < 7
-# rhbz#833512 provide a /usr/bin/openoffice.org-1.9, etc. for backwards compat
-ln -s libreoffice openoffice.org-2.0
-ln -s libreoffice openoffice.org-1.9
-%endif
 popd
 
 pushd %{buildroot}%{baseinstdir}/share/xdg/
@@ -1649,11 +1410,7 @@ unset WITH_LANG
 # work around flawed accessibility check
 export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
 export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
-%if 0%{?rhel} && 0%{?rhel} < 7
-timeout 2h make smoketest.subsequentcheck
-%else
 timeout -k 2m 2h make smoketest.subsequentcheck
-%endif
 # we don't need this anymore
 rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 
@@ -1826,10 +1583,8 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{baseinstdir}/program/libxsltdlglo.so
 %{baseinstdir}/program/libxsltfilterlo.so
 %{baseinstdir}/program/libxstor.so
-%if 0%{?fedora} || 0%{?rhel} >= 7
 # TODO how useful this is in Fedora?
 %{baseinstdir}/program/liblosessioninstalllo.so
-%endif
 %{baseinstdir}/program/libmigrationoo2lo.so
 %{baseinstdir}/program/libmigrationoo3lo.so
 %{baseinstdir}/program/libmsformslo.so
@@ -1985,9 +1740,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{baseinstdir}/share/gallery
 %dir %{baseinstdir}/share/labels
 %{baseinstdir}/share/labels/labels.xml
-%if 0%{?rhel} && 0%{?rhel} < 7
-%{baseinstdir}/share/liblangtag
-%endif
 %dir %{baseinstdir}/share/psprint
 %config %{baseinstdir}/share/psprint/psprint.conf
 %{baseinstdir}/share/psprint/driver
@@ -2088,21 +1840,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 #launchers
 %{_bindir}/libreoffice
 %{_bindir}/openoffice.org
-%if 0%{?rhel} && 0%{?rhel} < 7
-%{_bindir}/openoffice.org-1.9
-%{_bindir}/openoffice.org-2.0
-%endif
 %{_bindir}/soffice
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
-%if 0%{?rhel} && 0%{?rhel} < 7
-%{baseinstdir}/program/libraptor2-lo.so.0
-%{baseinstdir}/program/librasqal-lo.so.3
-%{baseinstdir}/program/librdf-lo.so.0
-%{baseinstdir}/program/libclucene.so
-%{baseinstdir}/program/liblcms2.so.2
-%{baseinstdir}/share/fingerprint
-%endif
 %{_mandir}/man1/libreoffice.1*
 %{_mandir}/man1/openoffice.org.1*
 %{_mandir}/man1/soffice.1*
@@ -2136,9 +1876,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files base
 %{baseinstdir}/help/en-US/sdatabase.*
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %{baseinstdir}/program/classes/hsqldb.jar
-%endif
 %{baseinstdir}/program/classes/reportbuilder.jar
 %{baseinstdir}/program/classes/reportbuilderwizard.jar
 %{baseinstdir}/program/classes/sdbc_hsqldb.jar
@@ -2356,14 +2094,12 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{baseinstdir}/share/registry/xsltfilter.xcd
 %{_datadir}/applications/libreoffice-xsltfilter.desktop
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %files postgresql
 %{baseinstdir}/program/libpostgresql-sdbclo.so
 %{baseinstdir}/program/libpostgresql-sdbc-impllo.so
 %{baseinstdir}/program/postgresql-sdbc.ini
 %{baseinstdir}/program/services/postgresql-sdbc.rdb
 %{baseinstdir}/share/registry/postgresql.xcd
-%endif
 
 %files ure
 %{baseinstdir}/program/classes/java_uno.jar