RPM: merge redhat directory with master branch

1 files changed, 79 insertions, 41 deletions

diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
index 52727c6a1..6fecd9bad 100644
--- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec
+++ b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
@@ -1,68 +1,106 @@
-# 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
+#
+# spec file for package kshowmail (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
-
-# Default version for this component
 %define tde_pkg kshowmail
-%define tde_version 14.0.0
-
-# TDE specific building variables
+%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}
-Version:        3.3.1
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:        Look messages into your mail server.
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.3.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Look messages into your mail server
+Group:		Applications/Internet
+URL:		http://sourceforge.net/projects/kshowmail/
 
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://sourceforge.net/projects/kshowmail/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-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
-
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
+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
+
+
 %description
 Very simply kshowmail is a program that allows you to look in on your mail server,
 see what is waiting, decide if it is legitimate, and delete it right off of the server if it is not.
-All without dragging any messages into your computer. 
+All without dragging any messages into your computer.
+
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 %prep
 %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"
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -89,6 +127,19 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %find_lang %{tde_pkg}
 
+# Move desktop icon to correct location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Install missing icons
+install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/16x16/apps/kshowmail.png"
+install -D -m 644 "pics/kshowmail.png"          "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kshowmail Network Email
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -112,18 +163,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %{tde_tdelibdir}/kcm_kshowmailconfiglog.so
 %{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.la
 %{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.so
-%{tde_datadir}/applnk/Internet/kshowmail.desktop
-%{tde_datadir}/apps/kshowmail/kshowmailui.rc
-%{tde_datadir}/apps/kshowmail/pics/eraser.png
-%{tde_datadir}/apps/kshowmail/pics/kshowmail.png
-%{tde_datadir}/apps/kshowmail/pics/kshowmail24.png
-%{tde_datadir}/apps/kshowmail/pics/letter-closed.png
-%{tde_datadir}/apps/kshowmail/pics/letter-open.png
-%{tde_datadir}/apps/kshowmail/pics/ok.png
-%{tde_datadir}/apps/kshowmail/pics/tool.png
-%{tde_datadir}/apps/kshowmail/sounds/neuepost.wav
-%{tde_datadir}/apps/kshowmail/sounds/newmail.wav
+%{tde_tdeappdir}/kshowmail.desktop
+%{tde_datadir}/apps/kshowmail/
 %{tde_datadir}/icons/crystalsvg/16x16/apps/kshowmail.png
+%{tde_datadir}/icons/hicolor/*/apps/kshowmail.png
 %{tde_datadir}/services/kshowmailconfigaccounts.desktop
 %{tde_datadir}/services/kshowmailconfigactions.desktop
 %{tde_datadir}/services/kshowmailconfigdisplay.desktop
@@ -142,8 +185,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.1-2
-- Initial release for TDE 14.0.0
-
-* Thu Apr 25 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.1-1
-- Initial release for TDE 3.5.13.2