RPM: merge redhat directory with master branch

3 files changed, 97 insertions, 98 deletions

diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index 1dbd78139..dc95cb8c7 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -1,50 +1,62 @@
-# Default version for this component
-%define tde_pkg digikam
+#
+# spec file for package digikam (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.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:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+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 +65,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} || 0%{?rhel} >= 7
+BuildRequires: liblcms-devel
+%else
+BuildRequires: lcms-devel
+%endif
+
 # GPHOTO2 support
 %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	gphoto2-devel
@@ -81,6 +115,13 @@ BuildRequires:	libexiv2-devel
 BuildRequires:	exiv2-devel
 %endif
 
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	sqlite3-devel
+%else
+BuildRequires:	sqlite-devel
+%endif
+
 Requires:		trinity-libkexiv2
 Requires:		trinity-libkdcraw
 Requires:		trinity-libkipi
@@ -184,6 +225,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,28 +263,15 @@ 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/
 
-%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 || : 
-
 ##########
 
 %package devel
 Group:			Development/Libraries
 Summary:		Development files for %{name}
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 %{summary}
@@ -254,18 +283,12 @@ Requires:		%{name} = %{version}-%{release}
 %{tde_libdir}/libdigikam.so
 %{tde_libdir}/libdigikam.la
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 ##########
 
 %package i18n
 Summary:		Translation files for %{tde_pkg}
 Group:			Applications/Utilities
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description i18n
 %{summary}
@@ -285,15 +308,15 @@ Requires:		%{name} = %{version}-%{release}
 %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
 %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
 %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
-#%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
+#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
-#%lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
+#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -301,12 +324,9 @@ 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"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -329,7 +349,9 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-final \
   --enable-closure \
   --enable-rpath \
-  --disable-gcc-hidden-visibility
+  --disable-gcc-hidden-visibility \
+  \
+  --without-included-sqlite3
 
 %__make %{?_smp_mflags} || %__make
 
@@ -341,11 +363,22 @@ 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
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec
index ff084696c..46bb635af 100644
--- a/redhat/applications/digikam/digikam-3.5.13.2.spec
+++ b/redhat/applications/digikam/digikam-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg digikam
 %define tde_version 3.5.13.2
 
-# 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_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -26,7 +21,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		digital photo management application for TDE [Trinity]
 Version:		0.9.6
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -127,7 +122,7 @@ Requires:		%{name} = %{version}-%{release}
 %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"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -314,40 +309,3 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-7
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4
-- Initial release for TDE 3.5.13.1
-
-* 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
-- Fix description
-- Add "BuildRequires: exiv2-devel"
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2
-- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]
-
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 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