RHEL/Fedora: some more updates for MGA2/MDV2011 building

19 files changed, 763 insertions, 401 deletions

diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec
index 4ebe7ed1e..3252bd4fa 100644
--- a/redhat/applications/amarok/trinity-amarok.spec
+++ b/redhat/applications/amarok/trinity-amarok.spec
@@ -1,25 +1,31 @@
 # Basic package informations
 %define kdecomp amarok
-%define version 1.4.10
-%define release 6
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%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/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:    trinity-%{kdecomp}
-Summary: Media player
-Version: %{version}
-Release: %{release}%{?dist}%{?_variant}
+%define _docdir %{tde_docdir}
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Media player
+Version:	1.4.10
+Release:	6%{?dist}%{?_variant}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -78,36 +84,42 @@ BuildRequires:  postgresql-devel
 BuildRequires:  SDL-devel
 BuildRequires:  taglib-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	trinity-libkarma-devel karma-sharp
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	trinity-libkarma-devel
+BuildRequires:	trinity-karma-sharp
+%else
+BuildRequires:	libkarma-devel
+BuildRequires:	karma-sharp
+%endif
 # not used anymore, in favor of libvisual ? -- Rex
 #%{?fedora:BuildRequires:  xmms-devel}
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-tqt-devel
 BuildRequires:	trinity-akode-devel
+BuildRequires:	trinity-konqueror-devel
+
+# ruby
+BuildRequires:	ruby
+BuildRequires:  ruby-devel
 
 # To open the selected browser, works with Patch2
 Requires:  xdg-utils
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-%if "%{?_prefix}" == "%{_usr}"
-Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-
-Obsoletes: amarok-devel < %{version}-%{release}
-%if 0%{?fedora} > 6 && 0%{?fedora} < 9
-# need to keep this around for previous releases, so not to break multilib compat.
-Provides:  amarok-devel = %{version}-%{release}
+# xine-lib
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:  libxine-devel
+%else
+BuildRequires:  xine-lib-devel
 %endif
 
-# engines, etc...
-# old, obsolete ones: arts, akode
-Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-%endif
 
-# xine-lib
-BuildRequires:  xine-lib-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}inotifytools-devel
+%else
+%endif
 
-Provides: %{name}-engine-xine = %{version}-%{release}
 
 %description
 Amarok is a multimedia player with:
@@ -115,38 +127,140 @@ Amarok is a multimedia player with:
  - plays all formats supported by the various engines
  - audio effects, like reverb and compressor
  - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the KDE look, but with a unique touch
+ - nice GUI, integrates into the TDE look, but with a unique touch
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS ChangeLog README
+%{tde_bindir}/amarok
+%{tde_bindir}/amarokapp
+%{tde_bindir}/amarokcollectionscanner
+%{tde_bindir}/amarok_proxy.rb
+%{tde_datadir}/apps/amarok/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/applications/kde/*.desktop
+%{tde_datadir}/servicetypes/*.desktop
+%{tde_datadir}/apps/profiles/amarok.profile.xml
+%{tde_datadir}/config/amarokrc
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/services/amarokitpc.protocol
+%{tde_datadir}/services/amaroklastfm.protocol
+%{tde_datadir}/services/amarokpcast.protocol
+# -libs ?  -- Rex
+%{tde_libdir}/libamarok.*
+# DAAP
+%{tde_bindir}/amarok_daapserver.rb
+%{tde_tdelibdir}/libamarok_daap-mediadevice.*
+%{tde_datadir}/services/amarok_daap-mediadevice.desktop
+# Mass-storage
+%{tde_datadir}/services/amarok_massstorage-device.desktop
+%{tde_tdelibdir}/libamarok_massstorage-device.*
+# NFS
+%{tde_datadir}/services/amarok_nfs-device.desktop
+%{tde_tdelibdir}/libamarok_nfs-device.*
+# SMB
+%{tde_datadir}/services/amarok_smb-device.desktop
+%{tde_tdelibdir}/libamarok_smb-device.*
+# IPod
+%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
+# VFAT
+%{tde_datadir}/services/amarok_generic-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_generic-mediadevice.*
+# iRiver
+%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
+# Creative Zen
+%{tde_datadir}/services/amarok_njb-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_njb-mediadevice.*
+# MTP players
+%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
+# Rio Karma
+%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
+# Void engine (noop)
+%{tde_datadir}/services/amarok_void-engine_plugin.desktop
+%{tde_tdelibdir}/libamarok_void-engine_plugin.*
+# Xine engine
+%{tde_datadir}/services/amarok_xine-engine.desktop
+%{tde_tdelibdir}/libamarok_xine-engine.*
+## Gstreamer engine
+#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
+#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
+# YAUAP
+%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
+%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
+# AKODE
+%{tde_datadir}/services/amarok_aKode-engine.desktop
+%{tde_tdelibdir}/libamarok_aKode-engine.*
+
+%post
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%postun
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+
+##########
 
 %package ruby
 Summary:	%{name} Ruby support
-Group: 	    Applications/Multimedia
-BuildRequires:  ruby-devel ruby
+Group:		Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 # For dir ownership and some default plugins (lyrics)
 Requires:  ruby
+
 %description ruby
 %{summary}.
 
+%files ruby
+%defattr(-,root,root,-)
+%{tde_libdir}/ruby_lib/*
+
+##########
 
 %package konqueror
-Summary: Amarok konqueror (service menus, sidebar) support
-Group:   Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Summary:	Amarok konqueror (service menus, sidebar) support
+Group:		Applications/Multimedia
+
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-konqueror
+
 %description konqueror
 %{summary}.
 
+%files konqueror
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%{tde_tdelibdir}/konqsidebar_universalamarok.*
+%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
+
+
+##########
+
 %package visualisation
 Summary:    Visualisation plugins for Amarok
 Group:      Applications/Multimedia
 Requires:   %{name} = %{version}-%{release}
 # No plugins by default, we need libvisual-plugins
 #Requires:   libvisual-plugins
+
 %description visualisation
 Amarok can use visualisation plugins from different origins.
 Right now, only xmms is supported, which means that you can
 use any of xmms' visualisation plugins with Amarok.
 
+%files visualisation
+%defattr(-,root,root,-)
+%{tde_bindir}/amarok_libvisual
+
+##########
+
 
 %prep
 %setup -q -n applications/amarok
@@ -162,14 +276,24 @@ use any of xmms' visualisation plugins with Amarok.
 
 
 %build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
 
+%if 0%{?rhel} || 0%{?fedora}
 %__mkdir_p build
 cd build
+%endif
+
 %cmake \
+	-DBIN_INSTALL_DIR=%{tde_bindir} \
+	-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+	-DLIB_INSTALL_DIR=%{tde_libdir} \
+	-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+	-DCMAKE_SKIP_RPATH="OFF" \
+	-DQT_LIBRARY_DIRS="${QTLIB}" \
 	-DWITH_LIBVISUAL=ON \
 	-DWITH_KONQSIDEBAR=ON \
 	-DWITH_XINE=ON \
@@ -182,7 +306,6 @@ cd build
 	-DWITH_RIOKARMA=ON \
 	-DWITH_DAAP=ON \
 	-DBUILD_ALL=ON \
-	-DQT_LIBRARY_DIRS="${QTLIB}" \
 	..
 
 %__make %{?_smp_mflags}
@@ -191,129 +314,36 @@ cd build
 %__rm -fr $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
-# desktop files
-desktop-file-install  --vendor "" \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
 
 # unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
 
 
 # HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_docdir}/HTML/* ; do
+for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     [ "$lang" == "en" ] && d=en/amarok || d=$lang
-    echo "%lang($lang) %doc %{tde_docdir}/HTML/$d" >> %{name}.lang
+    echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> %{name}.lang
   fi
 done
 
 # Locales
-for locale in $RPM_BUILD_ROOT%{_datadir}/locale/* ; do
+for locale in $RPM_BUILD_ROOT%{tde_datadir}/locale/* ; do
   if [ -r $locale/LC_MESSAGES/amarok.mo ]; then
     lang=$(basename $locale)
-    echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
+    echo "%lang($lang) %{tde_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
   fi
 done
 
 
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
 
 %clean
 %__rm -fr $RPM_BUILD_ROOT
 
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{_bindir}/amarok
-%{_bindir}/amarokapp
-%{_bindir}/amarokcollectionscanner
-%{_bindir}/amarok_proxy.rb
-%{_datadir}/apps/amarok/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/servicetypes/*.desktop
-%{_datadir}/apps/profiles/amarok.profile.xml
-%{_datadir}/config/amarokrc
-%{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/services/amarokitpc.protocol
-%{_datadir}/services/amaroklastfm.protocol
-%{_datadir}/services/amarokpcast.protocol
-# -libs ?  -- Rex
-%{_libdir}/libamarok.*
-# DAAP
-%{_bindir}/amarok_daapserver.rb
-%{tde_libdir}/libamarok_daap-mediadevice.*
-%{_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{_datadir}/services/amarok_massstorage-device.desktop
-%{tde_libdir}/libamarok_massstorage-device.*
-# NFS
-%{_datadir}/services/amarok_nfs-device.desktop
-%{tde_libdir}/libamarok_nfs-device.*
-# SMB
-%{_datadir}/services/amarok_smb-device.desktop
-%{tde_libdir}/libamarok_smb-device.*
-# IPod
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_libdir}/libamarok_ipod-mediadevice.*
-# VFAT
-%{_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_libdir}/libamarok_generic-mediadevice.*
-# iRiver
-%{_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_libdir}/libamarok_ifp-mediadevice.*
-# Creative Zen
-%{_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_libdir}/libamarok_njb-mediadevice.*
-# MTP players
-%{_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_libdir}/libamarok_mtp-mediadevice.*
-# Rio Karma
-%{_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_libdir}/libamarok_riokarma-mediadevice.*
-# Void engine (noop)
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_libdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%{_datadir}/services/amarok_xine-engine.desktop
-%{tde_libdir}/libamarok_xine-engine.*
-## Gstreamer engine
-#%{_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_libdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%{_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_libdir}/libamarok_yauap-engine_plugin.*
-# AKODE
-%{_datadir}/services/amarok_aKode-engine.desktop
-%{tde_libdir}/libamarok_aKode-engine.*
-
-%files ruby
-%defattr(-,root,root,-)
-%{_libdir}/ruby_lib/*
-
 
-%files konqueror
-%defattr(-,root,root,-)
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_libdir}/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/*/amarok.desktop
 
-%files visualisation
-%defattr(-,root,root,-)
-%{_bindir}/amarok_libvisual
 
 
 %changelog
diff --git a/redhat/applications/basket/trinity-basket-3.5.13.spec b/redhat/applications/basket/trinity-basket-3.5.13.spec
index 127bf4b30..07e8e4951 100644
--- a/redhat/applications/basket/trinity-basket-3.5.13.spec
+++ b/redhat/applications/basket/trinity-basket-3.5.13.spec
@@ -1,25 +1,31 @@
 # Default version for this component
 %define kdecomp basket
-%define version 1.0.3.1
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%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/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	Taking care of your ideas.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.0.3.1
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -42,7 +48,7 @@ BuildRequires: trinity-kdebase-devel
 BuildRequires: desktop-file-utils
 
 BuildRequires: gpgme-devel
-BuildRequires: trinity-kdepim-devel
+BuildRequires: trinity-tdepim-devel >= 3.5.13
 
 %description
 This application is mainly an all-purpose notes taker. It provide several baskets where
@@ -61,8 +67,8 @@ baskets to HTML.
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
@@ -70,10 +76,16 @@ baskets to HTML.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
+	--prefix=%{tde_prefix} \
+	--exec-prefix=%{tde_prefix} \
+	--bindir=%{tde_bindir} \
+	--libdir=%{tde_libdir} \
+	--datadir=%{tde_datadir} \
 	--disable-rpath \
     --with-extra-includes=%{_includedir}/tqt \
     --disable-static
@@ -82,10 +94,11 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+%find_lang %{kdecomp}
 
 %clean
 %__rm -rf %{buildroot}
@@ -93,37 +106,52 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 /sbin/ldconfig
 
 %postun
 for f in crystalsvg ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 /sbin/ldconfig
 
 
-%files
+%files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/services/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/services/*/*.desktop
-%{_datadir}/config/magic/*.magic
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-
+%{tde_bindir}/basket
+%{tde_tdeappdir}/basket.desktop
+%{tde_datadir}/apps/basket/
+%{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_datadir}/config/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
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch b/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch
new file mode 100644
index 000000000..bedb9f820
--- /dev/null
+++ b/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch
@@ -0,0 +1,31 @@
+--- bibletime/sword.m4.ftbfs	2011-05-17 20:42:02.000000000 +0200
++++ bibletime/sword.m4	2012-08-03 17:40:00.461746639 +0200
+@@ -119,7 +119,7 @@
+ EOF
+ 
+ 
+-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ if AC_TRY_EVAL(ac_link) && test -s conftest; then
+ 	if test -x conftest; then
+ 		eval ac_cv_installed_sword_version=`./conftest 2>&5`
+@@ -192,7 +192,7 @@
+ }
+ EOF
+ 
+-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ if AC_TRY_EVAL(ac_link) && test -s conftest; then
+ 	if test -x conftest; then
+ 		eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
+--- bibletime/clucene.m4.ORI	2012-08-03 17:41:19.989067063 +0200
++++ bibletime/clucene.m4	2012-08-03 17:41:35.675734952 +0200
+@@ -119,7 +119,7 @@
+ EOF
+ 
+ 
+-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ if AC_TRY_EVAL(ac_link) && test -s conftest; then
+ 	if test -x conftest; then
+ 		eval ac_cv_installed_clucene_version=`./conftest 2>&5`
diff --git a/redhat/applications/bibletime/trinity-bibletime.spec b/redhat/applications/bibletime/trinity-bibletime.spec
index 0ab483844..d88da085b 100644
--- a/redhat/applications/bibletime/trinity-bibletime.spec
+++ b/redhat/applications/bibletime/trinity-bibletime.spec
@@ -1,25 +1,31 @@
 # Default version for this component
 %define kdecomp bibletime
-%define version 1.6.6.0
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%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/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	A bible study tool for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.6.6.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -37,6 +43,8 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 Patch0:		bibletime-3.5.13-clucene_detection.patch
 # [bibletime] Fix compilation with GCC 4.7
 Patch1:		bibletime-3.5.13-fix_gcc47_compilation.patch
+# [bibletime] Fix FTBFS on Mageia 2, error at linking with 'sword'
+Patch2:		bibletime-3.5.13-fix_sword_linking.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
@@ -44,11 +52,16 @@ BuildRequires:	trinity-kdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+# Bibletime only works with clucene 0.9 ! Mageia 2 does not ship with that old version !
 %if 0%{?fedora} >= 16
 BuildRequires:	clucene09-core-devel
 %else
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	clucene-devel
+%else
 BuildRequires:	clucene-core-devel
 %endif
+%endif
 
 BuildRequires:	sword-devel
 Requires:		sword
@@ -64,13 +77,14 @@ texts, write own notes, save, print etc.).
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch0 -p0
-%patch1 -p1
+%patch1 -p1 -b .gcc47
+%patch2 -p1 -b .ftbfs
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
@@ -78,12 +92,19 @@ texts, write own notes, save, print etc.).
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
+	--prefix=%{tde_prefix} \
+	--exec-prefix=%{tde_prefix} \
+	--bindir=%{tde_bindir} \
+	--libdir=%{tde_libdir} \
+	--datadir=%{tde_datadir} \
+	--includedir=%{tde_tdeincludedir} \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+    --with-extra-includes=%{tde_includedir}/tqt
 
 # Not SMP safe !
 %__make -C bibletime/frontend
@@ -93,13 +114,13 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/tips
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
 
 
 
@@ -109,24 +130,24 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/bibletime
-%{_includedir}/bibletimeinterface.h
-%{_datadir}/applications/bibletime.desktop
-%{_datadir}/apps/bibletime
-%{_datadir}/icons/hicolor/*/*/*.png
-%{tde_docdir}/HTML/en/bibletime/
+%{tde_bindir}/bibletime
+%{tde_tdeincludedir}/bibletimeinterface.h
+%{tde_datadir}/applications/bibletime.desktop
+%{tde_datadir}/apps/bibletime/
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_tdedocdir}/HTML/en/bibletime/
 
 
 %Changelog
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_fomat_not_string_literal.patch b/redhat/applications/digikam/digikam-3.5.13-fix_fomat_not_string_literal.patch
new file mode 100644
index 000000000..a163feb78
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-fix_fomat_not_string_literal.patch
@@ -0,0 +1,19 @@
+commit 029218cd9cd3192a2a61ac29d896a2c3640f2dd8
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1336066180 -0500
+
+    Fix 'format not a string literal' error
+
+diff --git a/digikam/libs/sqlite2/shell.c b/digikam/libs/sqlite2/shell.c
+index 1100f38..89898ab 100644
+--- a/digikam/libs/sqlite2/shell.c
++++ b/digikam/libs/sqlite2/shell.c
+@@ -692,7 +692,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
+   }else
+ 
+   if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
+-    fprintf(stderr,zHelp);
++    fprintf(stderr, "%s", zHelp);
+   }else
+ 
+   if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg>1 ){
diff --git a/redhat/applications/digikam/digikam-3.5.13-jpegint-ftbfs.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_jpeg_code.patch
index 53b498329..c69027708 100644
--- a/redhat/applications/digikam/digikam-3.5.13-jpegint-ftbfs.patch
+++ b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_jpeg_code.patch
@@ -1,6 +1,14 @@
---- /dev/shm/applications/digikam/digikam/libs/jpegutils/jpegint.h	2011-05-19 22:00:43.000000000 -0500
-+++ /dev/shm/applications/digikam/digikam/libs/jpegutils/jpegint.h.new	2011-11-05 23:20:17.144180063 -0500
-@@ -42,9 +42,9 @@
+commit b9419cd5ed26f4ed70b882243cc4bd8a6f19797e
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1326324936 -0600
+
+    Fix digikam FTBFS due to jpeg code
+
+diff --git a/digikam/libs/jpegutils/jpegint.h b/digikam/libs/jpegutils/jpegint.h
+index 1fa82f8..27546f3 100644
+--- a/digikam/libs/jpegutils/jpegint.h
++++ b/digikam/libs/jpegutils/jpegint.h
+@@ -42,9 +42,9 @@ typedef enum {			/* Operating modes for buffer controllers */
  
  /* Master control module */
  struct jpeg_comp_master {
@@ -13,7 +21,7 @@
  
    /* State variables made visible to other modules */
    boolean call_pass_startup;	/* True if pass_startup must be called */
-@@ -53,16 +53,16 @@
+@@ -53,16 +53,16 @@ struct jpeg_comp_master {
  
  /* Main buffer control (downsampled-data buffer) */
  struct jpeg_c_main_controller {
@@ -34,7 +42,7 @@
  				   JSAMPARRAY input_buf,
  				   JDIMENSION *in_row_ctr,
  				   JDIMENSION in_rows_avail,
-@@ -73,23 +73,23 @@
+@@ -73,23 +73,23 @@ struct jpeg_c_prep_controller {
  
  /* Coefficient buffer control */
  struct jpeg_c_coef_controller {
@@ -64,7 +72,7 @@
  			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
  			     JSAMPIMAGE output_buf,
  			     JDIMENSION out_row_group_index));
-@@ -99,9 +99,9 @@
+@@ -99,9 +99,9 @@ struct jpeg_downsampler {
  
  /* Forward DCT (also controls coefficient quantization) */
  struct jpeg_forward_dct {
@@ -76,7 +84,7 @@
  			      jpeg_component_info * compptr,
  			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
  			      JDIMENSION start_row, JDIMENSION start_col,
-@@ -110,23 +110,23 @@
+@@ -110,23 +110,23 @@ struct jpeg_forward_dct {
  
  /* Entropy encoding */
  struct jpeg_entropy_encoder {
@@ -110,7 +118,7 @@
  };
  
  
-@@ -134,8 +134,8 @@
+@@ -134,8 +134,8 @@ struct jpeg_marker_writer {
  
  /* Master control module */
  struct jpeg_decomp_master {
@@ -121,7 +129,7 @@
  
    /* State variables made visible to other modules */
    boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-@@ -143,10 +143,10 @@
+@@ -143,10 +143,10 @@ struct jpeg_decomp_master {
  
  /* Input control module */
  struct jpeg_input_controller {
@@ -136,7 +144,7 @@
  
    /* State variables made visible to other modules */
    boolean has_multiple_scans;	/* True if file has multiple scans */
-@@ -155,18 +155,18 @@
+@@ -155,18 +155,18 @@ struct jpeg_input_controller {
  
  /* Main buffer control (downsampled-data buffer) */
  struct jpeg_d_main_controller {
@@ -161,7 +169,7 @@
  				 JSAMPIMAGE output_buf));
    /* Pointer to array of coefficient virtual arrays, or NULL if none */
    jvirt_barray_ptr *coef_arrays;
-@@ -174,8 +174,8 @@
+@@ -174,8 +174,8 @@ struct jpeg_d_coef_controller {
  
  /* Decompression postprocessing (color quantization buffer control) */
  struct jpeg_d_post_controller {
@@ -172,7 +180,7 @@
  				    JSAMPIMAGE input_buf,
  				    JDIMENSION *in_row_group_ctr,
  				    JDIMENSION in_row_groups_avail,
-@@ -186,12 +186,12 @@
+@@ -186,12 +186,12 @@ struct jpeg_d_post_controller {
  
  /* Marker reading & parsing */
  struct jpeg_marker_reader {
@@ -187,7 +195,7 @@
    /* Read a restart marker --- exported for use by entropy decoder only */
    jpeg_marker_parser_method read_restart_marker;
  
-@@ -206,8 +206,8 @@
+@@ -206,8 +206,8 @@ struct jpeg_marker_reader {
  
  /* Entropy decoding */
  struct jpeg_entropy_decoder {
@@ -198,7 +206,7 @@
  				JBLOCKROW *MCU_data));
  
    /* This is here to share code between baseline and progressive decoders; */
-@@ -216,21 +216,21 @@
+@@ -216,21 +216,21 @@ struct jpeg_entropy_decoder {
  };
  
  /* Inverse DCT (also performs dequantization) */
@@ -224,7 +232,7 @@
  			   JSAMPIMAGE input_buf,
  			   JDIMENSION *in_row_group_ctr,
  			   JDIMENSION in_row_groups_avail,
-@@ -243,20 +243,20 @@
+@@ -243,20 +243,20 @@ struct jpeg_upsampler {
  
  /* Colorspace conversion */
  struct jpeg_color_deconverter {
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch
new file mode 100644
index 000000000..0522ec982
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch
@@ -0,0 +1,30 @@
+commit 18ecd51264727c75ab3e17a762d8f95361023f0a
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1340749881 -0500
+
+    Fix FTBFS on png >= 0.15
+
+diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
+index 6dba518..97acf12 100644
+--- a/digikam/kioslave/digikamthumbnail.cpp
++++ b/digikam/kioslave/digikamthumbnail.cpp
+@@ -413,16 +413,16 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
+     if (color_type == PNG_COLOR_TYPE_PALETTE)
+         png_set_expand(png_ptr);
+ 
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         has_alpha = 1;
+ 
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++    if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+     {
+         has_alpha = 1;
+         has_grey = 1;
+     }
+ 
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
++    if (color_type == PNG_COLOR_TYPE_GRAY)
+         has_grey = 1;
+ 
+     unsigned char **lines;
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_libpng_1.4.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_code.patch
index a07b5ba6f..c384ff2fc 100644
--- a/redhat/applications/digikam/digikam-3.5.13-fix_libpng_1.4.patch
+++ b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_code.patch
@@ -1,49 +1,59 @@
-diff -ruN digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp
---- digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp 2009-07-03 07:19:41.000000000 +0200
-+++ digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp 2010-06-30 10:29:09.000000000 +0200
-@@ -370,7 +370,7 @@
-     unsigned char buf[PNG_BYTES_TO_CHECK];
+commit 3e27b07ff572b00aa5f013f039c3f63593016816
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1326324999 -0600
+
+    Fix FTBFS due to png code
+    This closes Bug 595
 
+diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
+index 33ba573..96cba8e 100644
+--- a/digikam/kioslave/digikamthumbnail.cpp
++++ b/digikam/kioslave/digikamthumbnail.cpp
+@@ -370,7 +370,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
+     unsigned char buf[PNG_BYTES_TO_CHECK];
+ 
      fread(buf, 1, PNG_BYTES_TO_CHECK, f);
 -    if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
 +    if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
      {
          fclose(f);
          return qimage;
-@@ -465,7 +465,7 @@
+@@ -465,7 +465,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
      {
          png_set_gray_to_rgb(png_ptr);
          if (png_get_bit_depth(png_ptr, info_ptr) < 8)
 -            png_set_gray_1_2_4_to_8(png_ptr);
 +            png_set_expand_gray_1_2_4_to_8(png_ptr);
      }
-
+ 
      int sizeOfUint = sizeof(unsigned int);
-diff -ruN digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp
---- digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp 2009-07-03 07:19:41.000000000 +0200
-+++ digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp 2010-06-30 10:28:24.000000000 +0200
-@@ -88,7 +88,7 @@
+diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
+index ac1fcf8..3367561 100644
+--- a/digikam/libs/dimg/loaders/pngloader.cpp
++++ b/digikam/libs/dimg/loaders/pngloader.cpp
+@@ -88,7 +88,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
      unsigned char buf[PNG_BYTES_TO_CHECK];
-
+ 
      fread(buf, 1, PNG_BYTES_TO_CHECK, f);
 -    if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
 +    if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
      {
          DDebug() << k_funcinfo << "Not a PNG image file." << endl;
          fclose(f);
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
  #ifdef ENABLE_DEBUG_MESSAGES
                  DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
  #endif
 -                png_set_gray_1_2_4_to_8(png_ptr);
 +                png_set_expand_gray_1_2_4_to_8(png_ptr);
                  png_set_gray_to_rgb(png_ptr);
-
+ 
                  if (TQImage::systemByteOrder() == TQImage::LittleEndian)       // Intel
-diff -ruN digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h digikam-0.9.6/digikam/libs/greycstoration/CImg.h
---- digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h  2009-07-03 07:19:41.000000000 +0200
-+++ digikam-0.9.6/digikam/libs/greycstoration/CImg.h  2010-06-30 10:28:52.000000000 +0200
-@@ -29449,7 +29449,7 @@
+diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h
+index e240f99..714920e 100644
+--- a/digikam/libs/greycstoration/CImg.h
++++ b/digikam/libs/greycstoration/CImg.h
+@@ -29449,7 +29449,7 @@ namespace cimg_library {
          new_bit_depth = 8;
        }
        if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index c1f0e1d6c..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- digikam/digikam/libs/dimg/loaders/pngloader.cpp.libpng	2012-05-01 15:02:57.235666444 +0200
-+++ digikam/digikam/libs/dimg/loaders/pngloader.cpp	2012-05-01 15:04:30.737122439 +0200
-@@ -408,10 +408,11 @@
-     TQMap<int, TQByteArray>& metaData = imageMetaData();
- 
-     png_charp   profile_name, profile_data=NULL;
-+	unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
-     png_uint_32 profile_size;
-     int         compression_type;
- 
--    png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_size);
-+    png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &profile_size);
- 
-     if (profile_data != NULL)
-     {
-@@ -607,7 +608,7 @@
- 
-     if (!profile_rawdata.isEmpty())
-     {
--        png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
-+        png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (unsigned char*)profile_rawdata.data(), profile_rawdata.size());
-     }
- 
-     // -------------------------------------------------------------------
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_libpng_support.patch b/redhat/applications/digikam/digikam-3.5.13-fix_libpng_support.patch
deleted file mode 100644
index 5ca2353ef..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_libpng_support.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- digikam/digikam/libs/dimg/loaders/pngloader.cpp.ORI	2012-05-01 14:49:41.357985513 +0200
-+++ digikam/digikam/libs/dimg/loaders/pngloader.cpp	2012-05-01 14:53:47.459349483 +0200
-@@ -120,7 +120,11 @@
-     // PNG error handling. If an error occurs during reading, libpng
-     // will jump here
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf(png_ptr)))
-+#else
-     if (setjmp(png_ptr->jmpbuf))
-+#endif
-     {
-         DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl;
-         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -526,7 +531,11 @@
-     // PNG error handling. If an error occurs during writing, libpng
-     // will jump here
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf(png_ptr)))
-+#else
-     if (setjmp(png_ptr->jmpbuf))
-+#endif
-     {
-         DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
-         fclose(f);
---- digikam/digikam/kioslave/digikamthumbnail.cpp.ORI	2012-05-01 15:44:40.237089691 +0200
-+++ digikam/digikam/kioslave/digikamthumbnail.cpp	2012-05-01 15:45:22.939534916 +0200
-@@ -392,7 +392,11 @@
-         return qimage;
-     }
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf(png_ptr)))
-+#else
-     if (setjmp(png_ptr->jmpbuf))
-+#endif
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-         fclose(f);
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch b/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
new file mode 100644
index 000000000..fa9f2a6d6
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
@@ -0,0 +1,41 @@
+commit 7d0d82b7d93af5822d4c84c4ebd4ad82b9e463d0
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1334801652 -0500
+
+    Fix usage of obsolete libpng jmpbuf member
+
+diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
+index 96cba8e..6dba518 100644
+--- a/digikam/kioslave/digikamthumbnail.cpp
++++ b/digikam/kioslave/digikamthumbnail.cpp
+@@ -392,7 +392,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
+         return qimage;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+         fclose(f);
+diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
+index 3367561..fd5d771 100644
+--- a/digikam/libs/dimg/loaders/pngloader.cpp
++++ b/digikam/libs/dimg/loaders/pngloader.cpp
+@@ -120,7 +120,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
+     // PNG error handling. If an error occurs during reading, libpng
+     // will jump here
+ 
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+         DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl;
+         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+@@ -526,7 +526,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
+     // PNG error handling. If an error occurs during writing, libpng
+     // will jump here
+ 
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+         DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
+         fclose(f);
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch b/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch
new file mode 100644
index 000000000..aa7e6f2b9
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch
@@ -0,0 +1,20 @@
+commit 5a0438539cbe7a99e9b6d0ed21d7b73342b4a6f6
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1336340005 -0500
+
+    Update patch in GIT hash a9489034 to use reinterpret_cast<iCCP_data>.
+    Thanks to /dev/ammo42.
+
+diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
+index fa6dad9..6862b6e 100644
+--- a/digikam/libs/dimg/loaders/pngloader.cpp
++++ b/digikam/libs/dimg/loaders/pngloader.cpp
+@@ -611,7 +611,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
+     if (!profile_rawdata.isEmpty())
+     {
+ #if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
+-        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
++        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, reinterpret_cast<iCCP_data>(profile_rawdata.data()), profile_rawdata.size());
+ #else
+         png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
+ #endif
diff --git a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix.patch b/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix.patch
new file mode 100644
index 000000000..69dcadda7
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix.patch
@@ -0,0 +1,50 @@
+commit a94890345ef2caae35a72ed3a398b2984349bb2f
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1335586728 -0500
+
+    GCC 4.7 fix.
+    This partially resolves bug report 958.
+    Thanks to David C. Rankin.
+
+diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
+index fd5d771..fa6dad9 100644
+--- a/digikam/libs/dimg/loaders/pngloader.cpp
++++ b/digikam/libs/dimg/loaders/pngloader.cpp
+@@ -57,6 +57,12 @@ extern "C"
+ namespace Digikam
+ {
+ 
++#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
++  typedef png_bytep iCCP_data;
++#else
++  typedef png_charp iCCP_data;
++#endif
++
+ PNGLoader::PNGLoader(DImg* image)
+          : DImgLoader(image)
+ {
+@@ -403,7 +409,12 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
+ 
+     TQMap<int, TQByteArray>& metaData = imageMetaData();
+ 
++#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
++    png_charp   profile_name;
++    iCCP_data   profile_data=NULL;
++#else
+     png_charp   profile_name, profile_data=NULL;
++#endif
+     png_uint_32 profile_size;
+     int         compression_type;
+ 
+@@ -599,7 +610,11 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
+ 
+     if (!profile_rawdata.isEmpty())
+     {
++#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
++        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
++#else
+         png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
++#endif
+     }
+ 
+     // -------------------------------------------------------------------
diff --git a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix2.patch b/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix2.patch
new file mode 100644
index 000000000..db5e90c6d
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix2.patch
@@ -0,0 +1,33 @@
+commit a209c81b78b8af98c53748bc1eb9020ef6b2605e
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1335586778 -0500
+
+    GCC 4.7 fix.
+    This partially resolves bug report 958.
+    Thanks to David C. Rankin.
+
+diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp
+index d6b9f74..07f43bb 100644
+--- a/digikam/digikam/albummanager.cpp
++++ b/digikam/digikam/albummanager.cpp
+@@ -1579,16 +1579,16 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data)
+ 
+         // Check if Year Album already exist.
+         DAlbum *yAlbum = 0;
+-        AlbumIterator it(d->rootDAlbum);
+-        while (it.current())
++        AlbumIterator it2(d->rootDAlbum);
++        while (it2.current())
+         {
+-            DAlbum* a = (DAlbum*)(*it);
++            DAlbum* a = (DAlbum*)(*it2);
+             if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
+             {
+                 yAlbum = a;
+                 break;
+             }
+-            ++it;
++            ++it2;
+         }
+ 
+         // If no, create Year album.
diff --git a/redhat/applications/digikam/digikam-3.5.13-libpng15+gcc47_1.patch b/redhat/applications/digikam/digikam-3.5.13-libpng15+gcc47_1.patch
deleted file mode 100644
index ccc51a80e..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-libpng15+gcc47_1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -uNrb digikam.orig/digikam/digikam/albummanager.cpp digikam/digikam/digikam/albummanager.cpp
---- digikam.orig/digikam/digikam/albummanager.cpp	2012-02-21 18:52:03.000000000 -0600
-+++ digikam/digikam/digikam/albummanager.cpp	2012-04-19 16:42:29.951033101 -0500
-@@ -1579,16 +1579,16 @@
- 
-         // Check if Year Album already exist.
-         DAlbum *yAlbum = 0;
--        AlbumIterator it(d->rootDAlbum);
--        while (it.current())
-+        AlbumIterator it2(d->rootDAlbum);
-+        while (it2.current())
-         {
--            DAlbum* a = (DAlbum*)(*it);
-+            DAlbum* a = (DAlbum*)(*it2);
-             if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
-             {
-                 yAlbum = a;
-                 break;
-             }
--            ++it;
-+            ++it2;
-         }
- 
-         // If no, create Year album.
-diff -uNrb digikam.orig/digikam/kioslave/digikamthumbnail.cpp digikam/digikam/kioslave/digikamthumbnail.cpp
---- digikam.orig/digikam/kioslave/digikamthumbnail.cpp	2012-04-19 07:02:43.000000000 -0500
-+++ digikam/digikam/kioslave/digikamthumbnail.cpp	2012-04-19 16:44:10.307517462 -0500
-@@ -413,16 +413,16 @@
-     if (color_type == PNG_COLOR_TYPE_PALETTE)
-         png_set_expand(png_ptr);
- 
--    if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         has_alpha = 1;
- 
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-         has_alpha = 1;
-         has_grey = 1;
-     }
- 
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+    if (color_type == PNG_COLOR_TYPE_GRAY)
-         has_grey = 1;
- 
-     unsigned char **lines;
diff --git a/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch b/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..a51f7256c
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch
@@ -0,0 +1,11 @@
+--- digikam/digikam/digikam/Makefile.am.ORI	2012-08-03 19:41:42.791088483 +0200
++++ digikam/digikam/digikam/Makefile.am	2012-08-03 19:41:56.661794764 +0200
+@@ -111,6 +111,8 @@
+ #       if shared libsqlite3 is used LIB_SQLITE3_LOCAL is null.
+ libdigikam_la_LIBADD = $(LIB_SQLITE3) \
+ 	               $(LIB_SQLITE3_LOCAL) \
++		       $(LIB_QT) \
++		       $(LIB_KPARTS) \
+ 	               $(LIB_KIO) \
+ 	               $(LIB_KABC) \
+ 	               $(LIB_KHTML) \
diff --git a/redhat/applications/digikam/digikam-3.5.13-remove_version_h.patch b/redhat/applications/digikam/digikam-3.5.13-remove_version_h.patch
new file mode 100644
index 000000000..3de45eead
--- /dev/null
+++ b/redhat/applications/digikam/digikam-3.5.13-remove_version_h.patch
@@ -0,0 +1,43 @@
+commit 0f64ac7c10fb4053f578ef950e55510818d6d440
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1334285499 -0500
+
+    Remove version.h. Cruft from an older version prior to 0.9.6.
+    Part of an extensive cleanup of various problems with kipi-plugins, digikam,
+    and gwenview to resolve bug reports 241, 962, 963.
+
+diff --git a/digikam/digikam/version.h b/digikam/digikam/version.h
+deleted file mode 100644
+index d9baae1..0000000
+--- a/digikam/digikam/version.h
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/* ============================================================
+- *
+- * This file is a part of digiKam project
+- * http://www.digikam.org
+- *
+- * Date        : 2004-09-09
+- * Description : digiKam release ID header.
+- *
+- * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- *
+- * This program is free software; you can redistribute it
+- * and/or modify it under the terms of the GNU General
+- * Public License as published by the Free Software Foundation;
+- * either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * ============================================================ */
+-
+-#ifndef DIGIKAM_VERSION_H
+-#define DIGIKAM_VERSION_H
+-
+-static const char digikam_version[] = "0.9.4";
+-
+-#endif // DIGIKAM_VERSION_H
diff --git a/redhat/applications/digikam/trinity-digikam-3.5.13.spec b/redhat/applications/digikam/trinity-digikam-3.5.13.spec
index cff40153c..6af36fa79 100644
--- a/redhat/applications/digikam/trinity-digikam-3.5.13.spec
+++ b/redhat/applications/digikam/trinity-digikam-3.5.13.spec
@@ -2,24 +2,30 @@
 %define kdecomp digikam
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_appdir %{_datadir}/applications/kde
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%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/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	digital photo management application for KDE [Trinity]
 Version:	0.9.6
-Release:	2%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -33,16 +39,29 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
-# TDE 3.5.13 on RHEL/Fedora specific patches
-Patch1:		digikam-3.5.13-jpegint-ftbfs.patch
-# [digikam] Add support for libpng 1.4 [Bug #595]
-Patch2:		digikam-3.5.13-fix_libpng_1.4.patch
-# [digikam] gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]
-Patch3:		digikam-3.5.13-libpng15+gcc47_1.patch
-# [digikam] Fix libpng support (again !!!)
-Patch4:		digikam-3.5.13-fix_libpng_support.patch
-# [digikam] Fix compilation with GCC 4.7
-Patch5:		digikam-3.5.13-fix_gcc47_compilation.patch
+# [digikam] Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
+Patch1:		digikam-3.5.13-fix_ftbfs_jpeg_code.patch
+# [digikam] Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
+Patch2:		digikam-3.5.13-fix_ftbfs_png_code.patch
+# [digikam] Remove version.h. Cruft from an older version prior to 0.9.6.
+#   Part of an extensive cleanup of various problems with kipi-plugins, digikam,
+#   and gwenview to resolve bug reports 241, 962, 963.
+Patch3:		digikam-3.5.13-remove_version_h.patch
+# [digikam] Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
+Patch4:		digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
+# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a9489034]
+Patch5:		digikam-3.5.13-gcc_47_fix.patch
+# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
+Patch6:		digikam-3.5.13-gcc_47_fix2.patch
+# [digikam] Fix 'format not a string literal' error [Commit #029218cd]
+Patch7:		digikam-3.5.13-fix_fomat_not_string_literal.patch
+# [digikam] Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
+Patch8:		digikam-3.5.13-fix_reinterpret_cast.patch
+# [digikam] Fix FTBFS on png >= 0.15 [Commit #18ecd512]
+Patch9:		digikam-3.5.13-fix_ftbfs_png_015.patch
+# [digikam] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
+Patch10:	digikam-3.5.13-missing_ldflags.patch
+
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
@@ -53,15 +72,19 @@ BuildRequires: gettext
 BuildRequires: trinity-libkexiv2-devel
 BuildRequires: trinity-libkdcraw-devel
 BuildRequires: trinity-libkipi-devel
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires: gphoto2-devel
 %else
 BuildRequires: libgphoto2-devel
 %endif
 BuildRequires: libtiff-devel
 BuildRequires: jasper-devel
-BuildRequires: exiv2-devel
 
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}exiv2-devel
+%else
+BuildRequires:	exiv2-devel
+%endif
 
 %description
 An easy to use and powerful digital photo management
@@ -95,19 +118,23 @@ Requires:	%{name} = %{version}
 
 %prep
 %setup -q -n applications/%{kdecomp}
-%patch1 -p5
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1 -b .libpng
-%if 0%{?fedora} >= 17
+%patch3 -p1 -E
+%patch4 -p1 
 %patch5 -p1 -b .gcc47
-%endif
+%patch6 -p1 -b .gcc47
+%patch7 -p1 -b .ftbfs
+%patch8 -p1
+%patch9 -p1 -b .png015
+%patch10 -p1 -b .ftbfs
+
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
@@ -116,37 +143,48 @@ Requires:	%{name} = %{version}
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
 
 %configure \
+	--prefix=%{tde_prefix} \
+	--exec-prefix=%{tde_prefix} \
+	--bindir=%{tde_bindir} \
+	--libdir=%{tde_libdir} \
+	--datadir=%{tde_datadir} \
+	--mandir=%{tde_mandir} \
+	--includedir=%{tde_tdeincludedir} \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
+    --with-extra-includes=%{tde_tdeincludedir}/tqt \
     --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 
+%find_lang %{kdecomp}
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig
+update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig
+update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
 %post devel
 /sbin/ldconfig
@@ -155,32 +193,92 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 
-%files
+%files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_libdir}/*.so.*
-%{tde_appdir}/*.desktop
-%{_datadir}/locale/*/LC_MESSAGES/digikam.mo
-%{_datadir}/services/*.desktop
-%{_datadir}/services/*.protocol
-%{_datadir}/servicetypes/digikamimageplugin.desktop
-%{_datadir}/apps/*/
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/hicolor/*/*/*
-%{_mandir}/man*/*
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
+%{tde_bindir}/digikam
+%{tde_bindir}/digikamthemedesigner
+%{tde_bindir}/digitaglinktree
+%{tde_bindir}/showfoto
+%{tde_libdir}/libdigikam.so.0
+%{tde_libdir}/libdigikam.so.0.0.0
+%{tde_tdelibdir}/kio_digikamalbums.la
+%{tde_tdelibdir}/kio_digikamalbums.so
+%{tde_tdelibdir}/kio_digikamdates.la
+%{tde_tdelibdir}/kio_digikamdates.so
+%{tde_tdelibdir}/kio_digikamsearch.la
+%{tde_tdelibdir}/kio_digikamsearch.so
+%{tde_tdelibdir}/kio_digikamtags.la
+%{tde_tdelibdir}/kio_digikamtags.so
+%{tde_tdelibdir}/kio_digikamthumbnail.la
+%{tde_tdelibdir}/kio_digikamthumbnail.so
+%{tde_tdeappdir}/digikam.desktop
+%{tde_tdeappdir}/showfoto.desktop
+%{tde_datadir}/apps/digikam/
+%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
+%{tde_datadir}/apps/showfoto/
+%{tde_datadir}/icons/hicolor/*/apps/digikam.png
+%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
+%{tde_datadir}/services/digikamalbums.protocol
+%{tde_datadir}/services/digikamdates.protocol
+%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
+%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
+%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
+%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
+%{tde_datadir}/services/digikamimageplugin_border.desktop
+%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
+%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
+%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
+%{tde_datadir}/services/digikamimageplugin_core.desktop
+%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
+%{tde_datadir}/services/digikamimageplugin_emboss.desktop
+%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
+%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
+%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
+%{tde_datadir}/services/digikamimageplugin_infrared.desktop
+%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
+%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
+%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
+%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
+%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
+%{tde_datadir}/services/digikamimageplugin_perspective.desktop
+%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
+%{tde_datadir}/services/digikamimageplugin_restoration.desktop
+%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
+%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
+%{tde_datadir}/services/digikamimageplugin_texture.desktop
+%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
+%{tde_datadir}/services/digikamsearch.protocol
+%{tde_datadir}/services/digikamtags.protocol
+%{tde_datadir}/services/digikamthumbnail.protocol
+%{tde_datadir}/servicetypes/digikamimageplugin.desktop
+%{tde_mandir}/man*/*
+%{tde_tdedocdir}/HTML/en/digikam-apidocs/
 
 
 %files devel
-%{_includedir}/*.h
-%{_includedir}/digikam/
-%{_libdir}/*.so
-%{_libdir}/*.la
+%{tde_tdeincludedir}/digikam_export.h
+%{tde_tdeincludedir}/digikam/
+%{tde_libdir}/libdigikam.so
+%{tde_libdir}/libdigikam.la
 
 
 %Changelog
+* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
+- Add support for Mageia 2 and Mandriva 2011
+- Removes old patches, adds GIT patches.
+- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
+- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
+- Remove version.h. Cruft from an older version prior to 0.9.6.
+- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
+- GCC 4.7 fix. [Bug #958] [Commit #a9489034]
+- GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
+- Fix 'format not a string literal' error [Commit #029218cd]
+- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
+- Fix FTBFS on png >= 0.15 [Commit #18ecd512]
+
 * Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
 - Fix man directory location
 - Fix postinstall
diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec
index a58b57375..dbc3aefbc 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine.spec
+++ b/redhat/applications/kaffeine/trinity-kaffeine.spec
@@ -2,7 +2,7 @@
 %define kdecomp kaffeine
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif