RPM: merge redhat directory with master branch

1 files changed, 68 insertions, 39 deletions

diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec
index 43af9cd92..b04652b96 100644
--- a/redhat/applications/krecipes/krecipes-14.0.0.spec
+++ b/redhat/applications/krecipes/krecipes-14.0.0.spec
@@ -1,8 +1,26 @@
-# Default version for this component
-%define tde_pkg krecipes
+#
+# spec file for package krecipes (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
+%endif
+%define tde_pkg krecipes
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -14,37 +32,49 @@
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-# 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
-
 
 
-Name:			trinity-%{tde_pkg}
-Summary:		Recipes manager for TDE
-Version:		1.0beta2
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0beta2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Recipes manager for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
 
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	gettext
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# 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
+
 # MYSQL support
 BuildRequires:	mysql-devel
 
@@ -54,6 +84,7 @@ BuildRequires:	postgresql-devel
 # SQLITE support
 BuildRequires:	sqlite-devel
 
+
 %description
 Krecipes is a TDE application designed to manage recipes. It can help you to
 do your shopping list, search through your recipes to find what you can do
@@ -61,7 +92,9 @@ with available ingredients and a diet helper. It can also import or export
 recipes from files in various format (eg RecipeML or Meal-Master) or from
 databases.
 
-%if 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -71,7 +104,7 @@ databases.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__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"
 
 
@@ -110,29 +143,27 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Fix desktop file location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/krecipes.desktop" "%{?buildroot}%{tde_tdeappdir}"
 
-%clean
-%__rm -rf %{buildroot}
-
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r krecipes Education Chemistry
+%endif
 
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
+# Removes duplicate files
+%fdupes "%{buildroot}%{tde_datadir}"
 
 
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
+%clean
+%__rm -rf %{buildroot}
 
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/krecipes
-%{tde_datadir}/applnk/Utilities/krecipes.desktop
+%{tde_tdeappdir}/krecipes.desktop
 %{tde_datadir}/apps/krecipes/
 %{tde_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png
 %{tde_datadir}/icons/hicolor/*/apps/krecipes.png
@@ -147,5 +178,3 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.0beta2-1
-- Initial release for TDE 14.0.0