diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index e729831..d59b7ba 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -1,35 +1,59 @@
-# 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
+#
+# spec file for package tdeutils (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/
+#
+# BUILD WARNING:
+# Remove qt-devel and qt3-devel and any kde*-devel on your system !
+# Having KDE libraries may cause FTBFS here !
+
+# TDE variables
%define tde_version 14.0.0
-
-# TDE specific building variables
+%define tde_pkg tdeutils
+%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_sbindir %{tde_prefix}/sbin
-
%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}
+# 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-tdeutils
+
+Name: trinity-%{tde_pkg}
+Summary: TDE Utilities
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License: GPL
-Summary: TDE Utilities
Group: Applications/System
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@...>
URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Project
+#Packager: Francois Andriot <francois.andriot@...>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,8 +63,6 @@
Source2: klaptop_acpi_helper.console
Source3: kcmlaptoprc
-Patch1: kdeutils-3.5.13.2-rhel4.patch
-
Obsoletes: trinity-kdeutils < %{version}-%{release}
Provides: trinity-kdeutils = %{version}-%{release}
Obsoletes: trinity-kdeutils-extras < %{version}-%{release}
@@ -48,15 +70,27 @@
Obsoletes: tdeutils < %{version}-%{release}
Provides: tdeutils = %{version}-%{release}
-BuildRequires: cmake >= 2.8
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: autoconf automake libtool m4
+
+BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
BuildRequires: gettext
BuildRequires: net-snmp-devel
BuildRequires: python-devel
BuildRequires: gmp-devel
+
+# 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
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
BuildRequires: libXScrnSaver-devel
@@ -968,7 +1002,7 @@
##########
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -976,9 +1010,6 @@
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .rhel4
-%endif
%build
@@ -1068,6 +1099,29 @@
%endif
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file KEdit Utility TextEditor
+%suse_update_desktop_file superkaramba Utility DesktopUtility
+%suse_update_desktop_file KCharSelect Utility Accessibility
+%suse_update_desktop_file khexedit Utility Editor
+%suse_update_desktop_file Kjots Utility TimeUtility
+%suse_update_desktop_file ktimer Utility TimeUtility
+%suse_update_desktop_file kwikdisk System Applet
+%suse_update_desktop_file kdf System Filesystem
+%suse_update_desktop_file ark System Archiving
+%suse_update_desktop_file kcalc Utility Calculator
+%suse_update_desktop_file kgpg Utility Security
+%suse_update_desktop_file irkick Applet
+%suse_update_desktop_file kwalletmanager Applet
+%suse_update_desktop_file kregexpeditor Utility Editor
+%suse_update_desktop_file kcmdf
+%suse_update_desktop_file kcmlirc
+%suse_update_desktop_file kwalletconfig
+%suse_update_desktop_file thinkpad
+%suse_update_desktop_file kvaio
+%suse_update_desktop_file KFloppy System Filesystem
+%endif
%clean
%__rm -rf "%{?buildroot}"
|