RPM packaging: update digikam

14 files changed, 80 insertions, 1240 deletions

diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index 1dbd78139..15db96b07 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -1,50 +1,60 @@
-# Default version for this component
-%define tde_pkg digikam
+#
+# spec file for package digikam (version R14.0.0)
+#
+# 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
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg digikam
+%define tde_prefix /opt/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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
 Name:			trinity-%{tde_pkg}
-Summary:		digital photo management application for TDE [Trinity]
+Epoch:			%{tde_epoch}
 Version:		0.9.6
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		Digital photo management application for TDE
 Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
 URL:			http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
+
 Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		digikam-open_in_digikam.desktop
 
-# [Digikam] Revert PNG support to libpng12 (for RHEL4)
-Patch1:		digikam-3.5.13.2-fix_png12_support.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
@@ -53,9 +63,31 @@ BuildRequires:	trinity-libkexiv2-devel
 BuildRequires:	trinity-libkdcraw-devel
 BuildRequires:	trinity-libkipi-devel
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
 BuildRequires:	libtiff-devel
 BuildRequires:	gettext
 
+# 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
+
+# LCMS support
+%if 0%{?suse_version}
+BuildRequires: liblcms-devel
+%else
+BuildRequires: lcms-devel
+%endif
+
 # GPHOTO2 support
 %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	gphoto2-devel
@@ -184,6 +216,7 @@ digiKam is based in part on the work of the Independent JPEG Group.
 %{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/konqueror/servicemenus/digikam-open_in_digikam.desktop
 %{tde_datadir}/apps/showfoto/
 %{tde_datadir}/icons/hicolor/*/apps/digikam.png
 %{tde_datadir}/icons/hicolor/*/apps/showfoto.png
@@ -221,7 +254,6 @@ digiKam is based in part on the work of the Independent JPEG Group.
 %{tde_datadir}/services/digikamthumbnail.protocol
 %{tde_datadir}/servicetypes/digikamimageplugin.desktop
 %{tde_mandir}/man*/*
-#%{tde_tdedocdir}/HTML/en/digikam-apidocs/
 %{tde_tdedocdir}/HTML/en/digikam/
 %{tde_tdedocdir}/HTML/en/showfoto/
 
@@ -293,7 +325,7 @@ Requires:		%{name} = %{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -301,9 +333,6 @@ Requires:		%{name} = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .png12
-%endif
 
 %__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"
@@ -341,11 +370,24 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Hide 'showfoto'.
+echo "NoDisplay=true" >> "$RPM_BUILD_ROOT%{tde_tdeappdir}/showfoto.desktop"
+
+# Install the 'open in digikam' action for konqueror.
+install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file digikam  Graphics Photography
+%suse_update_desktop_file showfoto Graphics Viewer
+%suse_update_desktop_file "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop"
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %changelog
-* Mon Jul 29 2013 Francois Andriot <[email protected]> - 0.9.6-8
+* Mon Jul 29 2013 Francois Andriot <[email protected]> - 2:0.9.6-1
 - Initial release for TDE 14.0.0
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
deleted file mode 100644
index a163feb78..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_fomat_not_string_literal.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 029218cd9cd3192a2a61ac29d896a2c3640f2dd8
-Author: Timothy Pearson <[email protected]>
-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-fix_ftbfs_jpeg_code.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_jpeg_code.patch
deleted file mode 100644
index c69027708..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_jpeg_code.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-commit b9419cd5ed26f4ed70b882243cc4bd8a6f19797e
-Author: Timothy Pearson <[email protected]>
-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 {
--  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean call_pass_startup;	/* True if pass_startup must be called */
-@@ -53,16 +53,16 @@ struct jpeg_comp_master {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_c_main_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
- 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
- 			       JDIMENSION in_rows_avail));
- };
- 
- /* Compression preprocessing (downsampling input buffer control) */
- struct jpeg_c_prep_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
- 				   JSAMPARRAY input_buf,
- 				   JDIMENSION *in_row_ctr,
- 				   JDIMENSION in_rows_avail,
-@@ -73,23 +73,23 @@ struct jpeg_c_prep_controller {
- 
- /* Coefficient buffer control */
- struct jpeg_c_coef_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
- 				   JSAMPIMAGE input_buf));
- };
- 
- /* Colorspace conversion */
- struct jpeg_color_converter {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
- 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
- 				JDIMENSION output_row, int num_rows));
- };
- 
- /* Downsampling */
- struct jpeg_downsampler {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
- 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
- 			     JSAMPIMAGE output_buf,
- 			     JDIMENSION out_row_group_index));
-@@ -99,9 +99,9 @@ struct jpeg_downsampler {
- 
- /* Forward DCT (also controls coefficient quantization) */
- struct jpeg_forward_dct {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-   /* perhaps this should be an array??? */
--  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
-+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
- 			      jpeg_component_info * compptr,
- 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
- 			      JDIMENSION start_row, JDIMENSION start_col,
-@@ -110,23 +110,23 @@ struct jpeg_forward_dct {
- 
- /* Entropy encoding */
- struct jpeg_entropy_encoder {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
--  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-+  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- };
- 
- /* Marker writing */
- struct jpeg_marker_writer {
--  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-   /* These routines are exported to allow insertion of extra markers */
-   /* Probably only COM and APPn markers should be written this way */
--  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
- 				      unsigned int datalen));
--  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
- };
- 
- 
-@@ -134,8 +134,8 @@ struct jpeg_marker_writer {
- 
- /* Master control module */
- struct jpeg_decomp_master {
--  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-@@ -143,10 +143,10 @@ struct jpeg_decomp_master {
- 
- /* Input control module */
- struct jpeg_input_controller {
--  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean has_multiple_scans;	/* True if file has multiple scans */
-@@ -155,18 +155,18 @@ struct jpeg_input_controller {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_d_main_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
- 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
- 			       JDIMENSION out_rows_avail));
- };
- 
- /* Coefficient buffer control */
- struct jpeg_d_coef_controller {
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
- 				 JSAMPIMAGE output_buf));
-   /* Pointer to array of coefficient virtual arrays, or NULL if none */
-   jvirt_barray_ptr *coef_arrays;
-@@ -174,8 +174,8 @@ struct jpeg_d_coef_controller {
- 
- /* Decompression postprocessing (color quantization buffer control) */
- struct jpeg_d_post_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
- 				    JSAMPIMAGE input_buf,
- 				    JDIMENSION *in_row_group_ctr,
- 				    JDIMENSION in_row_groups_avail,
-@@ -186,12 +186,12 @@ struct jpeg_d_post_controller {
- 
- /* Marker reading & parsing */
- struct jpeg_marker_reader {
--  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-   /* Read markers until SOS or EOI.
-    * Returns same codes as are defined for jpeg_consume_input:
-    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-    */
--  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
-+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-   /* Read a restart marker --- exported for use by entropy decoder only */
-   jpeg_marker_parser_method read_restart_marker;
- 
-@@ -206,8 +206,8 @@ struct jpeg_marker_reader {
- 
- /* Entropy decoding */
- struct jpeg_entropy_decoder {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- 				JBLOCKROW *MCU_data));
- 
-   /* This is here to share code between baseline and progressive decoders; */
-@@ -216,21 +216,21 @@ struct jpeg_entropy_decoder {
- };
- 
- /* Inverse DCT (also performs dequantization) */
--typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
-+typedef JMETHOD(void, inverse_DCT_method_ptr,
- 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
- 		 JCOEFPTR coef_block,
- 		 JSAMPARRAY output_buf, JDIMENSION output_col));
- 
- struct jpeg_inverse_dct {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-   /* It is useful to allow each component to have a separate IDCT method. */
-   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
- };
- 
- /* Upsampling (note that upsampler must also call color converter) */
- struct jpeg_upsampler {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
- 			   JSAMPIMAGE input_buf,
- 			   JDIMENSION *in_row_group_ctr,
- 			   JDIMENSION in_row_groups_avail,
-@@ -243,20 +243,20 @@ struct jpeg_upsampler {
- 
- /* Colorspace conversion */
- struct jpeg_color_deconverter {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
- 				JSAMPIMAGE input_buf, JDIMENSION input_row,
- 				JSAMPARRAY output_buf, int num_rows));
- };
- 
- /* Color quantization or color precision reduction */
- struct jpeg_color_quantizer {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
--  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
- 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
- 				 int num_rows));
--  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
- };
- 
- 
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
deleted file mode 100644
index 0522ec982..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 18ecd51264727c75ab3e17a762d8f95361023f0a
-Author: Timothy Pearson <[email protected]>
-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_ftbfs_png_code.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_code.patch
deleted file mode 100644
index c384ff2fc..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_code.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-commit 3e27b07ff572b00aa5f013f039c3f63593016816
-Author: Timothy Pearson <[email protected]>
-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 @@ 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 --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 @@ 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 --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){
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-         new_bit_depth = 8;
-       }
-       if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
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
deleted file mode 100644
index fa9f2a6d6..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 7d0d82b7d93af5822d4c84c4ebd4ad82b9e463d0
-Author: Timothy Pearson <[email protected]>
-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
deleted file mode 100644
index aa7e6f2b9..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 5a0438539cbe7a99e9b6d0ed21d7b73342b4a6f6
-Author: Darrell Anderson <[email protected]>
-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
deleted file mode 100644
index 69dcadda7..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit a94890345ef2caae35a72ed3a398b2984349bb2f
-Author: Darrell Anderson <[email protected]>
-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
deleted file mode 100644
index db5e90c6d..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit a209c81b78b8af98c53748bc1eb9020ef6b2605e
-Author: Darrell Anderson <[email protected]>
-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-missing_ldflags.patch b/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch
deleted file mode 100644
index a51f7256c..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 3de45eead..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-remove_version_h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 0f64ac7c10fb4053f578ef950e55510818d6d440
-Author: Darrell Anderson <[email protected]>
-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/digikam-3.5.13.1.spec b/redhat/applications/digikam/digikam-3.5.13.1.spec
deleted file mode 100644
index 9901bd7ab..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.1.spec
+++ /dev/null
@@ -1,341 +0,0 @@
-# Default version for this component
-%define kdecomp digikam
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%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}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%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:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [digikam] Fix FTBFS on png >= 0.15 [Commit #18ecd512]
-Patch9:		digikam-3.5.13-fix_ftbfs_png_015.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	trinity-libkexiv2-devel >= 3.5.13.1
-BuildRequires:	trinity-libkdcraw-devel >= 3.5.13.1
-BuildRequires:	trinity-libkipi-devel >= 3.5.13.1
-%if 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	gphoto2-devel
-%else
-BuildRequires:	libgphoto2-devel
-%endif
-BuildRequires:	libtiff-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# JASPER support
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%else
-BuildRequires:	jasper-devel
-%endif
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-Requires:	trinity-libkexiv2 >= 3.5.13.1
-Requires:	trinity-libkdcraw >= 3.5.13.1
-Requires:	trinity-libkipi >= 3.5.13.1
-
-%description
-An easy to use and powerful digital photo management
-application, which makes importing, organizing and manipulating
-digital photos a "snap".  An interface is provided to connect to
-your digital camera, preview the images and download and/or
-delete them.
-
-The digiKam built-in image editor makes the common photo correction
-a simple task. The image editor is extensible via plugins and,
-the digikamimageplugins project has been merged to digiKam core
-since release 0.9.2, all useful image editor plugins are available
-in the base installation.
-
-digiKam can also make use of the KIPI image handling plugins to
-extend its capabilities even further for photo manipulations,
-import and export, etc. The kipi-plugins package contains many
-very useful extentions.
-
-digiKam is based in part on the work of the Independent JPEG Group.
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	Development files for %{name}
-Requires:	%{name} = %{version}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch9 -p1 -b .png015
-
-
-# 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|%{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"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-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=%{tde_tdeincludedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-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 %{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 || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{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}/digikamimageplugin_adjustcurves.la
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.la
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.so
-%{tde_tdelibdir}/digikamimageplugin_blurfx.la
-%{tde_tdelibdir}/digikamimageplugin_blurfx.so
-%{tde_tdelibdir}/digikamimageplugin_border.la
-%{tde_tdelibdir}/digikamimageplugin_border.so
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.la
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.so
-%{tde_tdelibdir}/digikamimageplugin_charcoal.la
-%{tde_tdelibdir}/digikamimageplugin_charcoal.so
-%{tde_tdelibdir}/digikamimageplugin_colorfx.la
-%{tde_tdelibdir}/digikamimageplugin_colorfx.so
-%{tde_tdelibdir}/digikamimageplugin_core.la
-%{tde_tdelibdir}/digikamimageplugin_core.so
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.la
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.so
-%{tde_tdelibdir}/digikamimageplugin_emboss.la
-%{tde_tdelibdir}/digikamimageplugin_emboss.so
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.la
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.so
-%{tde_tdelibdir}/digikamimageplugin_freerotation.la
-%{tde_tdelibdir}/digikamimageplugin_freerotation.so
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.la
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.so
-%{tde_tdelibdir}/digikamimageplugin_infrared.la
-%{tde_tdelibdir}/digikamimageplugin_infrared.so
-%{tde_tdelibdir}/digikamimageplugin_inpainting.la
-%{tde_tdelibdir}/digikamimageplugin_inpainting.so
-%{tde_tdelibdir}/digikamimageplugin_inserttext.la
-%{tde_tdelibdir}/digikamimageplugin_inserttext.so
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.la
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.so
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.la
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.so
-%{tde_tdelibdir}/digikamimageplugin_perspective.la
-%{tde_tdelibdir}/digikamimageplugin_perspective.so
-%{tde_tdelibdir}/digikamimageplugin_raindrop.la
-%{tde_tdelibdir}/digikamimageplugin_raindrop.so
-%{tde_tdelibdir}/digikamimageplugin_restoration.la
-%{tde_tdelibdir}/digikamimageplugin_restoration.so
-%{tde_tdelibdir}/digikamimageplugin_sheartool.la
-%{tde_tdelibdir}/digikamimageplugin_sheartool.so
-%{tde_tdelibdir}/digikamimageplugin_superimpose.la
-%{tde_tdelibdir}/digikamimageplugin_superimpose.so
-%{tde_tdelibdir}/digikamimageplugin_texture.la
-%{tde_tdelibdir}/digikamimageplugin_texture.so
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.la
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.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
-%{tde_tdeincludedir}/digikam_export.h
-%{tde_tdeincludedir}/digikam/
-%{tde_libdir}/libdigikam.so
-%{tde_libdir}/libdigikam.la
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.9.6-4
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <[email protected]> - 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 <[email protected]> - 0.9.6-3
-- Fix man directory location
-- Fix postinstall
-- Fix description
-- Add "BuildRequires: exiv2-devel"
-
-* Tue May 01 2012 Francois Andriot <[email protected]> - 0.9.6-2
-- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]
-
-* Sun Nov 06 2011 Francois Andriot <[email protected]> - 0.9.6-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
diff --git a/redhat/applications/digikam/digikam-3.5.13.spec b/redhat/applications/digikam/digikam-3.5.13.spec
deleted file mode 100644
index f1ff6d1ab..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.spec
+++ /dev/null
@@ -1,297 +0,0 @@
-# Default version for this component
-%define kdecomp digikam
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%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:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [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
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: trinity-libkexiv2-devel
-BuildRequires: trinity-libkdcraw-devel
-BuildRequires: trinity-libkipi-devel
-%if 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: gphoto2-devel
-%else
-BuildRequires: libgphoto2-devel
-%endif
-BuildRequires: libtiff-devel
-BuildRequires: jasper-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%else
-BuildRequires:	exiv2-devel
-%endif
-
-Requires:	trinity-libkexiv2
-Requires:	trinity-libkdcraw
-Requires:	trinity-libkipi
-
-%description
-An easy to use and powerful digital photo management
-application, which makes importing, organizing and manipulating
-digital photos a "snap".  An interface is provided to connect to
-your digital camera, preview the images and download and/or
-delete them.
-
-The digiKam built-in image editor makes the common photo correction
-a simple task. The image editor is extensible via plugins and,
-the digikamimageplugins project has been merged to digiKam core
-since release 0.9.2, all useful image editor plugins are available
-in the base installation.
-
-digiKam can also make use of the KIPI image handling plugins to
-extend its capabilities even further for photo manipulations,
-import and export, etc. The kipi-plugins package contains many
-very useful extentions.
-
-digiKam is based in part on the work of the Independent JPEG Group.
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	Development files for %{name}
-Requires:	%{name} = %{version}
-
-%description devel
-%{summary}
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 -E
-%patch4 -p1 
-%patch5 -p1 -b .gcc47
-%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|%{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"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-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=%{tde_tdeincludedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-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 %{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 || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{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
-%{tde_tdeincludedir}/digikam_export.h
-%{tde_tdeincludedir}/digikam/
-%{tde_libdir}/libdigikam.so
-%{tde_libdir}/libdigikam.la
-
-
-%Changelog
-* Fri Aug 03 2012 Francois Andriot <[email protected]> - 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 <[email protected]> - 0.9.6-3
-- Fix man directory location
-- Fix postinstall
-- Fix description
-- Add "BuildRequires: exiv2-devel"
-
-* Tue May 01 2012 Francois Andriot <[email protected]> - 0.9.6-2
-- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]
-
-* Sun Nov 06 2011 Francois Andriot <[email protected]> - 0.9.6-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
diff --git a/redhat/applications/digikam/digikam-open_in_digikam.desktop b/redhat/applications/digikam/digikam-open_in_digikam.desktop
new file mode 100644
index 000000000..ddf7f93b4
--- /dev/null
+++ b/redhat/applications/digikam/digikam-open_in_digikam.desktop
@@ -0,0 +1,8 @@
+[Desktop Action OpenDigikam]
+Exec=digikam --download-from %u
+Icon=digikam
+Name=Open in Digikam
+
+[Desktop Entry]
+Actions=OpenDigikam;
+ServiceTypes=media/gphoto2camera,media/camera_mounted,media/camera_unmounted