RPM: many updates for upcoming R14.1.3

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 32 insertions, 18 deletions

diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index ee072fad4..f47ad25d1 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -48,6 +48,10 @@
 # Required for Mageia 2: removes the ldflag '--no-undefined'
 %global _disable_ld_no_undefined 1
 
+%if 0%{?mdkver} >= 5000000
+%global build_cxxflags %optflags -Wl,--allow-shlib-undefined
+%endif
+
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -210,7 +214,7 @@ BuildRequires:	freetype-devel
 %if 0%{?mdkver} || 0%{?mgaversion}
 BuildRequires:	%{_lib}png-devel
 %endif
-%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
+%if 0%{?mdkversion} && 0%{?mdkver} < 5000000 && 0%{?pclinuxos} == 0
 BuildRequires:	%{_lib}png15-devel
 %endif
 %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@@ -293,32 +297,32 @@ Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mdkver} < 24090000
+%define with_wv2 1
+%if 0%{mdkver} >= 5000000
+BuildRequires:	wv2-devel
+%else
 BuildRequires:	%{_lib}wv2-devel
 %endif
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%define with_wv2 1
 BuildRequires:	wv2-devel
 %endif
 
 # MESA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
-BuildRequires:	%{_lib}mesagl-devel
-%endif
-%if 0%{?mdkver} >= 24090000
-BuildRequires:	%{_lib}glu-devel
-%else
-BuildRequires:	%{_lib}mesaglu1-devel
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
 %endif
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
 %endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libGL-devel
-BuildRequires:	libGLU-devel
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
 %endif
-%if 0%{?suse_version} >= 1220
-BuildRequires:	Mesa-libGL-devel
-BuildRequires:	Mesa-libGLU-devel
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
 %endif
 
 # LIBXI support
@@ -883,7 +887,9 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_tdelibdir}/libwmlimport.*
 %{tde_tdelibdir}/libwpexport.*
 %{tde_tdelibdir}/libwpimport.*
+%if 0%{?with_wv2}
 %{tde_tdelibdir}/libmswordimport.*
+%endif
 %{tde_tdelibdir}/libxsltimport.*
 %{tde_tdelibdir}/libxsltexport.*
 %{tde_tdelibdir}/libhancomwordimport.*
@@ -1189,10 +1195,18 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
   %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
   %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
 
+# Ensure PQXX was detected (required by kexidb/pgsql)
 %if "%{?with_postgresql}" != ""
-# Ensure PQXX was detected
-
+if grep 'S\["compile_pgsql_plugin_TRUE"\]="#"' config.status; then
+  exit 1
+fi
+%endif
 
+# Ensure WV2 was detected
+%if 0%{?with_wv2}
+if grep 'S\["include_wv2_msword_filter_TRUE"\]="#"' config.status; then
+  exit 2
+fi
 %endif
 
 %__make %{?_smp_mflags} || %__make