more fixes

libreoffice.spec

@@ -99,9 +99,8 @@ Source46:       https://raw.githubusercontent.com/gnome-design-team/gnome-icons/
 Source47:       https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-math-symbolic.svg
 Source48:       https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-writer-symbolic.svg
 
-%if 0%{?rhel} && 0%{?rhel} < 8
+%if 0%{?rhel}
-Source100:      %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+%if 0%{?rhel} < 8
-Source101:      %{external_url}/liborcus-0.13.1.tar.xz
 Source102:      %{external_url}/mdds-1.3.1.tar.bz2
 Source103:      %{external_url}/libcmis-0.5.1.tar.gz
 Source104:      %{external_url}/libwps-0.4.8.tar.xz
@@ -114,24 +113,30 @@ Source110:      %{external_url}/gpgme-1.9.0.tar.bz2
 Source111:      %{external_url}/libgpg-error-1.27.tar.bz2
 Source112:      %{external_url}/libassuan-2.4.3.tar.bz2
 Source113:      %{external_url}/cppunit-1.14.0.tar.gz
-Source114:      %{external_url}/libqxp-0.0.1.tar.xz
+%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite --without-system-gpgmepp --without-system-cppunit
-Source115:      %{external_url}/libepubgen-0.1.0.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite --without-system-gpgmepp --without-system-cppunit --without-system-libqxp --without-system-libepubgen
 
 Provides: bundled(gpgme) = 1.9.0
 Provides: bundled(graphite2) = 1.3.10
 Provides: bundled(harfbuzz) = 1.7.0
 Provides: bundled(libassuan) = 2.4.3
 Provides: bundled(libcmis) = 0.5.1
-Provides: bundled(libepubgen) = 0.1.0
 Provides: bundled(libgpg-error) = 1.27
-Provides: bundled(liborcus) = 0.13.1
 Provides: bundled(libpagemaker) = 0.0.4
-Provides: bundled(libqxp) = 0.0.1
 Provides: bundled(libstaroffice) = 0.0.5
 Provides: bundled(libwps) = 0.4.7
 Provides: bundled(libzmf) = 0.0.2
 Provides: bundled(mdds) = 1.3.1
+%endif
+
+Source100:      %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+Source101:      %{external_url}/liborcus-0.13.1.tar.gz
+Source114:      %{external_url}/libqxp-0.0.1.tar.xz
+Source115:      %{external_url}/libepubgen-0.1.0.tar.bz2
+%global bundling_options %{?bundling_options} --without-system-orcus --without-system-libqxp --without-system-libepubgen
+
+Provides: bundled(libepubgen) = 0.1.0
+Provides: bundled(liborcus) = 0.13.1
+Provides: bundled(libqxp) = 0.0.1
 Provides: bundled(ucpp) = 1.3.2
 %endif
 
@@ -236,14 +241,16 @@ BuildRequires: pkgconfig(graphite2)
 BuildRequires: pkgconfig(harfbuzz)
 BuildRequires: pkgconfig(libcmis-0.5)
 BuildRequires: pkgconfig(libeot)
-BuildRequires: pkgconfig(libepubgen-0.1)
-BuildRequires: pkgconfig(liborcus-0.13)
 BuildRequires: pkgconfig(libpagemaker-0.0)
-BuildRequires: pkgconfig(libqxp-0.0)
 BuildRequires: pkgconfig(libstaroffice-0.0)
 BuildRequires: pkgconfig(libwps-0.4)
 BuildRequires: pkgconfig(libzmf-0.0)
 BuildRequires: pkgconfig(mdds-1.2)
+%if 0%{?fedora}
+BuildRequires: pkgconfig(libepubgen-0.1)
+BuildRequires: pkgconfig(liborcus-0.13)
+BuildRequires: pkgconfig(libqxp-0.0)
+%endif
 %endif
 
 # java stuff
@@ -1076,7 +1083,7 @@ export ARCH_FLAGS
 export CFLAGS=$ARCH_FLAGS
 export CXXFLAGS=$ARCH_FLAGS
 
-%if 0%{?rhel} && 0%{?rhel} < 8
+%if 0%{?rhel}
 %define distrooptions --disable-eot --enable-python=system
 %else # fedora
 %define distrooptions --enable-eot --enable-kde4 --with-system-ucpp