RPM Packaging: massive updates for R14.0.1

1 files changed, 11 insertions, 3 deletions

diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 8dcbe7f83..4183bf3eb 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg koffice
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -44,6 +45,9 @@
 # Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
 %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
+
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -163,7 +167,10 @@ BuildRequires:	utempter-devel
 %if 0%{?rhel} == 4
 BuildRequires:	utempter
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}utempter-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 5
 BuildRequires:	libutempter-devel
 %endif
 
@@ -662,8 +669,8 @@ update-desktop-database -q &> /dev/null ||:
 %{tde_tdelibdir}/kexi.*
 # moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
 %{tde_tdelibdir}/libkspreadkexiimport.*
-%{tde_datadir}/config/kexirc
-%{tde_datadir}/config/magic/kexi.magic
+%{tde_confdir}/kexirc
+%{tde_confdir}/magic/kexi.magic
 %{tde_datadir}/mimelnk/application/*
 %{tde_datadir}/servicetypes/kexi*.desktop
 %{tde_datadir}/services/kexi/
@@ -1111,6 +1118,7 @@ This package is part of the TDE Office Suite.
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export kde_confdir="%{tde_confdir}"
 
 %if 0%{?suse_version} == 1220
 RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')