RPM: synchronize redhat directory with r14.1.x branch

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

1 files changed, 85 insertions, 17 deletions

diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index e137cc9b9..9ec132b50 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg koffice
 %define tde_prefix /opt/trinity
@@ -46,7 +46,7 @@
 %global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
 
 # Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
+%global _disable_ld_no_undefined 1
 
 
 Name:		trinity-%{tde_pkg}
@@ -96,22 +96,65 @@ BuildRequires:	brp-check-trinity
 
 BuildRequires:	fontconfig-devel
 BuildRequires:	libart_lgpl-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	ImageMagick-devel
 BuildRequires:	zlib-devel
-BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 BuildRequires:	gettext-devel
 BuildRequires:	mysql-devel
 BuildRequires:	perl
 BuildRequires:	doxygen
 BuildRequires:	aspell-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	OpenEXR-devel
-BuildRequires:	libexif-devel
 BuildRequires:	readline-devel
 
+# EXIF support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}exif-devel
+%else
+BuildRequires:	libexif-devel
+%endif
+
+# IMAGEMAGICK support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}magick-devel
+%else
+BuildRequires:	ImageMagick-devel
+%endif
+
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
+
+# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
+BuildRequires:	openssl-devel
+%endif
+
+# OPENEXR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openexr-devel
+%else
+BuildRequires:	OpenEXR-devel
+%endif
+
+# TIFF support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}tiff-devel
+%else
+BuildRequires:	libtiff-devel
+%endif
+
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
+BuildRequires:	libxslt-devel
+%endif
+
 # PYTHON support
 #  lib/kross/configure.in.in :
 #   WARNING: Building Kross python plugin is now prohibited at all times,
@@ -164,10 +207,10 @@ BuildRequires:	freetype-devel
 %endif
 
 # LIBPNG support
-%if 0%{?mgaversion}
+%if 0%{?mdkver} || 0%{?mgaversion}
 BuildRequires:	%{_lib}png-devel
 %endif
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
+%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
 BuildRequires:	%{_lib}png15-devel
 %endif
 %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@@ -181,9 +224,13 @@ BuildRequires:	libpng-devel
 BuildRequires:	GraphicsMagick >= 1.1.0
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}graphicsmagick-devel
+%else
 BuildRequires:	GraphicsMagick-devel >= 1.1.0
 %endif
 %endif
+%endif
 
 # UTEMPTER support
 %if 0%{?suse_version}
@@ -226,29 +273,45 @@ BuildRequires:	postgresql-server-devel
 %else
 BuildRequires:	postgresql-devel
 %endif
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}pqxx-devel
+%else
 BuildRequires:	libpqxx-devel
 %endif
 %endif
+%endif
 Obsoletes:		trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WPD support
 #  For chalk and filters
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}wpd-devel
+%else
 BuildRequires:	libwpd-devel
+%endif
 Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver} < 24090000
 BuildRequires:	%{_lib}wv2-devel
 %endif
+%endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 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
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
@@ -1072,8 +1135,12 @@ This package is part of the TDE Office Suite.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
+%if 0%{?mdkver}
+touch config.h.in
+%endif
+
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -1122,6 +1189,12 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
   %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
   %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
 
+%if %{?with_postgresql}
+# Ensure PQXX was detected
+
+
+%endif
+
 %__make %{?_smp_mflags} || %__make
 
 
@@ -1129,11 +1202,6 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
-#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do
-#  mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/;
-#done
-
 # Fix desktop icon location
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}"