RPM Packaging: massive updates for R14.0.1

19 files changed, 272 insertions, 35 deletions

diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 3d88d4962..6b3aaed08 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg amarok
 %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
@@ -271,7 +272,7 @@ Amarok is a multimedia player with:
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/servicetypes/*.desktop
 %{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
+%{tde_confdir}/amarokrc
 %{tde_datadir}/config.kcfg/*.kcfg
 %{tde_datadir}/services/amarokitpc.protocol
 %{tde_datadir}/services/amaroklastfm.protocol
@@ -456,6 +457,7 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
diff --git a/redhat/applications/basket/basket-14.0.1.spec b/redhat/applications/basket/basket-14.0.1.spec
new file mode 100644
index 000000000..68c2e481b
--- /dev/null
+++ b/redhat/applications/basket/basket-14.0.1.spec
@@ -0,0 +1,208 @@
+#
+# spec file for package basket (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.1
+%endif
+%define tde_pkg basket
+%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
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.3.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Taking care of your ideas.
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gpgme-devel
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This application is mainly an all-purpose notes taker. It provide several baskets where
+to drop every sort of items: text, rich text, links, images, sounds, files, colors,
+application launcher... Objects can be edited, copied, dragged... So, you can arrange
+them as you want ! This application can be used to quickly drop web objects (link, text,
+images...) or notes, as well as to free your clutered desktop (if any). It is also useful
+to collect informations for a report. Those data can be shared with co-workers by exporting
+baskets to HTML.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility
+%endif
+
+# Apps that should stay in TDE
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in crystalsvg ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+
+%postun
+for f in crystalsvg ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/basket
+%{tde_tdeappdir}/basket.desktop
+%{tde_datadir}/apps/basket/
+%dir %{tde_datadir}/apps/kontact/ksettingsdialog
+%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+%{tde_libdir}/libbasketcommon.la
+%{tde_libdir}/libbasketcommon.so
+%{tde_tdelibdir}/basketthumbcreator.la
+%{tde_tdelibdir}/basketthumbcreator.so
+%{tde_tdelibdir}/kcm_basket.la
+%{tde_tdelibdir}/kcm_basket.so
+%{tde_tdelibdir}/libbasketpart.la
+%{tde_tdelibdir}/libbasketpart.so
+%{tde_tdelibdir}/libkontact_basket.la
+%{tde_tdelibdir}/libkontact_basket.so
+%{tde_confdir}/magic/basket.magic
+%{tde_datadir}/icons/crystalsvg/*/*/*
+%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
+%{tde_datadir}/mimelnk/application/x-basket-template.desktop
+%{tde_datadir}/services/basket_config_apps.desktop
+%{tde_datadir}/services/basket_config_baskets.desktop
+#%{tde_datadir}/services/basket_config_features.desktop
+%{tde_datadir}/services/basket_config_general.desktop
+%{tde_datadir}/services/basket_config_new_notes.desktop
+#%{tde_datadir}/services/basket_config_notes.desktop
+%{tde_datadir}/services/basket_config_notes_appearance.desktop
+%{tde_datadir}/services/basket_part.desktop
+%{tde_datadir}/services/basketthumbcreator.desktop
+%{tde_datadir}/services/kontact/basket.desktop
+%{tde_datadir}/services/kontact/basket_v4.desktop
+%{tde_tdedocdir}/HTML/en/basket/
+
+
+%changelog
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.3.1-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec
index 31c9b6a01..837729e47 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg filelight
 %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
@@ -100,6 +101,7 @@ directories on your computer.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -159,7 +161,7 @@ done
 %{tde_datadir}/apps/filelight/
 %{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
 %{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_datadir}/config/filelightrc
+%{tde_confdir}/filelightrc
 %{tde_datadir}/services/*.desktop
 %{tde_tdelibdir}/libfilelight.so
 %{tde_tdelibdir}/libfilelight.la
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index bb38a178b..779501470 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -24,6 +24,7 @@
 %define tde_prefix /opt/trinity
 %define tde_appdir %{tde_datadir}/applications
 %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
@@ -276,7 +277,7 @@ BuildArch: noarch
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
+%{tde_confdir}/k3brc
 %{tde_datadir}/mimelnk/application/x-k3b.desktop
 %{tde_datadir}/icons/hicolor/*/apps/k3b.png
 %{tde_datadir}/services/tdefile_k3b.desktop
@@ -433,6 +434,7 @@ and a generic audio and video file converter.
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export kde_confdir="%{tde_confdir}"
 
 # FFMPEG trick ...
 if [ -d /usr/include/ffmpeg ]; then
@@ -488,7 +490,7 @@ fi
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_confdir}/k3brc
 
 # remove the .la files
 %__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
index 9a16c058b..b5f2cc11a 100644
--- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec
+++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
@@ -84,7 +84,11 @@ BuildRequires:	openssl-devel
 # UTEMPTER support
 %if 0%{?suse_version}
 BuildRequires:	utempter-devel
-%else
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}utempter-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
 %if 0%{?rhel} == 4
 %else
 BuildRequires:	libutempter-devel
diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec
index a02e0e722..4eed8e069 100644
--- a/redhat/applications/kdbg/kdbg-14.0.0.spec
+++ b/redhat/applications/kdbg/kdbg-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg kdbg
 %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
@@ -120,6 +121,7 @@ Features include the following:
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -173,7 +175,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || :
 %{tde_bindir}/kdbg
 %{tde_tdeappdir}/kdbg.desktop
 %{tde_datadir}/apps/kdbg/
-%{tde_datadir}/config/kdbgrc
+%{tde_confdir}/kdbgrc
 %lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
 %lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
diff --git a/redhat/applications/kiosktool/kiosktool-14.0.0.spec b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
index 585cfa0f8..0354c3f79 100644
--- a/redhat/applications/kiosktool/kiosktool-14.0.0.spec
+++ b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
@@ -24,6 +24,7 @@
 %define tde_prefix /opt/trinity
 %define tde_appdir %{tde_datadir}/applications
 %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
@@ -104,6 +105,7 @@ groups of users.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -132,8 +134,8 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
-%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kiosktoolrc"
+%__mkdir_p "%{?buildroot}%{tde_confdir}"
+cat <<EOF >"%{?buildroot}%{tde_confdir}/kiosktoolrc"
 [General]
 GroupBlacklist=bin,daemon,sys,tty,disk,lp,www,kmem,wheel,mail,news,uucp,shadow,utmp,at,xok,named,ftp,postfix,maildrop,man,sshd,distcc,nobody,nogroup
 EOF
@@ -170,7 +172,7 @@ update-desktop-database >& /dev/null ||:
 %{tde_datadir}/apps/kiosktool/
 %{tde_tdedocdir}/HTML/en/kiosktool/
 %{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_datadir}/config/kiosktoolrc
+%{tde_confdir}/kiosktoolrc
 
 %changelog
 * Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0-1
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.1.spec b/redhat/applications/kmplayer/kmplayer-14.0.1.spec
index bbe8f3145..f19972c3b 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.1.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.1.spec
@@ -23,6 +23,7 @@
 %define tde_pkg kmplayer
 %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
@@ -213,7 +214,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
+%{tde_confdir}/kmplayerrc
 %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %{tde_datadir}/apps/kmplayer/noise.gif
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
@@ -277,6 +278,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export kde_confdir="%{tde_confdir}"
 
 %configure \
   --prefix=%{tde_prefix} \
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index 1d9679ef3..90bdf9d0f 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg kmyfirewall
 %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
@@ -150,7 +151,7 @@ done
 %{tde_datadir}/apps/kmfsystray/
 %{tde_datadir}/apps/kmyfirewall/
 %{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
+%{tde_confdir}/kmyfirewallrc
 %{tde_tdedocdir}/HTML/en/kmyfirewall/
 %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
 %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
@@ -198,6 +199,7 @@ Requires:		%{name} = %{version}-%{release}
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 %configure \
   --prefix=%{tde_prefix} \
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index c1b92a345..da75f202a 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -33,6 +33,8 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+# Required for Mageia >= 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -56,7 +58,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		kmymoneytitlelabel.png
-Patch0:			kmymoney-14.0.1-ftbfs.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -203,7 +204,6 @@ This package contains development files needed for KMyMoney plugins.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
 
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch b/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch
deleted file mode 100644
index e1a0bc572..000000000
--- a/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am.orig	2015-06-28 12:58:53.565869007 +0200
-+++ trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am	2015-06-28 12:59:16.595869143 +0200
-@@ -33,7 +33,7 @@
- libkmm_mymoney_la_METASOURCES = AUTO
- 
- libkmm_mymoney_la_SOURCES = mymoneymoney.cpp mymoneyfinancialcalculator.cpp mymoneytransactionfilter.cpp mymoneyobject.cpp mymoneykeyvaluecontainer.cpp mymoneyobserver.cpp mymoneysubject.cpp mymoneysplit.cpp mymoneyinstitution.cpp mymoneyexception.cpp mymoneyinvesttransaction.cpp mymoneyutils.cpp mymoneysecurity.cpp mymoneytransaction.cpp mymoneyscheduled.cpp mymoneypayee.cpp mymoneyfile.cpp mymoneycategory.cpp mymoneyaccount.cpp mymoneyreport.cpp mymoneystatement.cpp mymoneyprice.cpp mymoneybudget.cpp mymoneyobjectcontainer.cpp mymoneyforecast.cpp
--libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION)
-+libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION) $(LIB_QT) $(LIB_TDECORE)
- 
- SUBDIRS = storage 
- 
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"])')
diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
index d7bc13318..47d4c79cc 100644
--- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
@@ -33,6 +33,9 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
index 0570f8c2e..fc3a033be 100644
--- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg ksquirrel
 %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
@@ -124,6 +125,7 @@ OpenGL and dynamic format support.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
@@ -188,9 +190,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
 %{tde_datadir}/apps/ksquirrel/
 %{tde_datadir}/apps/ksquirrelpart/
-%{tde_datadir}/config/magic/x-ras.magic
-%{tde_datadir}/config/magic/x-sun.magic
-%{tde_datadir}/config/magic/x-utah.magic
+%{tde_confdir}/magic/x-ras.magic
+%{tde_confdir}/magic/x-sun.magic
+%{tde_confdir}/magic/x-utah.magic
 %{tde_tdedocdir}/HTML/*/ksquirrel
 %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
 %{tde_datadir}/mimelnk/image/*.desktop
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index 962454c8b..9140be79b 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
@@ -33,6 +33,9 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 5e5f95dfa..ec25aeec5 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -140,7 +140,7 @@ in addition to the PKCS certificate functionality
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %if 0%{?rhel} != 6
-%patch0 -p1 -b .ftbfs
+#patch0 -p1 -b .ftbfs
 %endif
 
 %__sed -i "Makefile" \
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
index f4094752e..11b860c1b 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
@@ -23,6 +23,7 @@
 %define tde_pkg tde-systemsettings
 %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
@@ -109,6 +110,7 @@ Control Centre with an improved user interface.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 
 %configure \
@@ -181,7 +183,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %{tde_datadir}/applications/tde/medianotifications.desktop
 %{tde_datadir}/applications/tde/systemsettings.desktop
 %{tde_datadir}/apps/systemsettings/
-%{tde_datadir}/config/systemsettingsrc
+%{tde_confdir}/systemsettingsrc
 %{tde_datadir}/desktop-directories/*.directory
 %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
 %{tde_tdedocdir}/HTML/en/systemsettings/
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 585a3253d..5488e31d1 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg tdepowersave
 %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
@@ -184,6 +185,7 @@ fi
   \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -224,7 +226,7 @@ update-desktop-database %{tde_tdeappdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
-if [ $1 = 0 ] && [ -r "/etc/acpi/actions/power.sh.tdepowersavebackup" ]; then
+if [ $1 = 0 ] && [ -r "/etc/acpi/actions/power.sh.tdepowersavebackup" ]; then
   %__mv -f "/etc/acpi/actions/power.sh.tdepowersavebackup" "/etc/acpi/actions/power.sh"
 fi
 
@@ -241,7 +243,7 @@ fi
 %{tde_datadir}/apps/tdepowersave/
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/autostart/tdepowersave-autostart.desktop
-%{tde_datadir}/config/tdepowersaverc
+%{tde_confdir}/tdepowersaverc
 
 %lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/
 %lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 744397f36..809254bf8 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg tellico
 %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
@@ -131,7 +132,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_bindir}/tellico
 #%{tde_datadir}/pixmaps
 %{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
+%{tde_confdir}/tellicorc
 
 ##########
 
@@ -232,6 +233,7 @@ fi
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 # Warning, --enable-final causes FTBFS !
 %configure \