RPM packaging: update digikam

1 files changed, 72 insertions, 30 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 <francois.andriot@free.fr>
 URL:			http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:			%{_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 <francois.andriot@free.fr> - 0.9.6-8
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.9.6-1
 - Initial release for TDE 14.0.0