RPM: merge redhat directory with master branch

3 files changed, 204 insertions, 600 deletions

diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec
index 3f721ce66..993f41a18 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdegames (version R14.0.0)
+# spec file for package tdegames (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,10 +21,13 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdegames
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -34,16 +37,11 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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-tdegames
+Name:			trinity-%{tde_pkg}
 Summary:		Trinity Desktop Environment - Games
 Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
@@ -60,18 +58,38 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
 BuildRequires:	fdupes
 BuildRequires:	libtool
 
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# ATTR support
+BuildRequires:	libattr-devel
+
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -82,6 +100,9 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
+# GLIB2 support
+BuildRequires:	glib2-devel
+
 Obsoletes:		trinity-kdegames < %{version}-%{release}
 Provides:		trinity-kdegames = %{version}-%{release}
 Obsoletes:		trinity-kdegames-libs < %{version}-%{release}
@@ -152,6 +173,7 @@ TDE desktop.
 
 %files devel
 %defattr(-,root,root,-)
+%{tde_datadir}/cmake/libtdegames.cmake
 
 ##########
 
@@ -176,20 +198,6 @@ This package is part of TDE, and a component of the TDE games module.
 %{tde_datadir}/icons/crystalsvg/*/actions/roll.png
 %{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
 
-%post -n trinity-libtdegames1
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdegames1
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
 ##########
 
 %package -n trinity-libtdegames-devel
@@ -254,22 +262,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/atlantik/
 %{tde_tdedocdir}/HTML/en/atlantik/
 
-%post -n trinity-atlantik
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-atlantik
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-atlantik-devel
@@ -294,12 +286,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_libdir}/libatlantikui.so
 %{tde_libdir}/libatlantikui.la
 
-%post -n trinity-atlantik-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-atlantik-devel
-/sbin/ldconfig || :
-
 ##########
 
 %package -n trinity-kasteroids
@@ -325,20 +311,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/kasteroids.kcfg
 %{tde_tdedocdir}/HTML/en/kasteroids/
 
-%post -n trinity-kasteroids
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kasteroids
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-katomic
@@ -361,20 +333,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/katomic
 %{tde_tdedocdir}/HTML/en/katomic/
 
-%post -n trinity-katomic
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-katomic
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kbackgammon
@@ -399,20 +357,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
 %{tde_tdedocdir}/HTML/en/kbackgammon/
 
-%post -n trinity-kbackgammon
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbackgammon
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kbattleship
@@ -436,20 +380,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kbattleship
 %{tde_tdedocdir}/HTML/en/kbattleship/
 
-%post -n trinity-kbattleship
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbattleship
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kblackbox
@@ -474,20 +404,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kblackbox
 %{tde_tdedocdir}/HTML/en/kblackbox/
 
-%post -n trinity-kblackbox
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kblackbox
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kbounce
@@ -522,20 +438,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kbounce
 %{tde_tdedocdir}/HTML/en/kbounce/
 
-%post -n trinity-kbounce
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbounce
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kenolaba
@@ -562,20 +464,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kenolaba
 %{tde_tdedocdir}/HTML/en/kenolaba/
 
-%post -n trinity-kenolaba
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kenolaba
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kfouleggs
@@ -599,20 +487,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
 %{tde_tdedocdir}/HTML/en/kfouleggs/
 
-%post -n trinity-kfouleggs
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfouleggs
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kgoldrunner
@@ -645,20 +519,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kgoldrunner
 %{tde_tdedocdir}/HTML/en/kgoldrunner/
 
-%post -n trinity-kgoldrunner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgoldrunner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kjumpingcube
@@ -684,20 +544,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/kjumpingcube.kcfg
 %{tde_tdedocdir}/HTML/en/kjumpingcube/
 
-%post -n trinity-kjumpingcube
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kjumpingcube
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-klickety
@@ -719,20 +565,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/klickety/
 %{tde_tdedocdir}/HTML/en/klickety/
 
-%post -n trinity-klickety
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klickety
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-klines
@@ -763,20 +595,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/klines.png
 %{tde_tdedocdir}/HTML/en/klines/
 
-%post -n trinity-klines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kmahjongg
@@ -799,20 +617,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/kmahjongg.kcfg
 %{tde_tdedocdir}/HTML/en/kmahjongg/
 
-%post -n trinity-kmahjongg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmahjongg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kmines
@@ -839,20 +643,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kmines
 %{tde_tdedocdir}/HTML/en/kmines/
 
-%post -n trinity-kmines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-knetwalk
@@ -875,20 +665,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/knetwalk.desktop
 %{tde_tdedocdir}/HTML/en/knetwalk/
 
-%post -n trinity-knetwalk
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knetwalk
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kolf
@@ -903,7 +679,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %files -n trinity-kolf
 %defattr(-,root,root,-)
-%{tde_datadir}/config/magic/kolf.magic
+%{tde_confdir}/magic/kolf.magic
 %{tde_datadir}/apps/kolf/
 %{tde_bindir}/kolf
 %{tde_tdeappdir}/kolf.desktop
@@ -917,22 +693,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_libdir}/libkolf.so.1
 %{tde_libdir}/libkolf.so.1.2.0
 %{tde_tdedocdir}/HTML/en/kolf/
-
-%post -n trinity-kolf
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kolf
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+%{tde_confdir}/magic/kolf.magic.mgc
 
 ##########
 
@@ -953,12 +714,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_libdir}/libkolf.la
 %{tde_libdir}/libkolf.so
 
-%post -n trinity-kolf-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kolf-devel
-/sbin/ldconfig || :
-
 ##########
 
 %package -n trinity-konquest
@@ -980,20 +735,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/konquest
 %{tde_tdedocdir}/HTML/en/konquest/
 
-%post -n trinity-konquest
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-konquest
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kpat
@@ -1014,20 +755,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kpat
 %{tde_tdedocdir}/HTML/en/kpat/
 
-%post -n trinity-kpat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kpoker
@@ -1048,20 +775,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kpoker
 %{tde_tdedocdir}/HTML/en/kpoker/
 
-%post -n trinity-kpoker
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpoker
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kreversi
@@ -1091,20 +804,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/kreversi.png
 %{tde_tdedocdir}/HTML/en/kreversi/
 
-%post -n trinity-kreversi
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kreversi
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ksame
@@ -1127,20 +826,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/ksame.desktop
 %{tde_tdedocdir}/HTML/en/ksame/
 
-%post -n trinity-ksame
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksame
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kshisen
@@ -1164,20 +849,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kshisen
 %{tde_tdedocdir}/HTML/en/kshisen/
 
-%post -n trinity-kshisen
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kshisen
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ksirtet
@@ -1205,20 +876,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/ksirtet.kcfg
 %{tde_tdedocdir}/HTML/en/ksirtet/
 
-%post -n trinity-ksirtet
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksirtet
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ksmiletris
@@ -1240,20 +897,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/ksmiletris
 %{tde_tdedocdir}/HTML/en/ksmiletris/
 
-%post -n trinity-ksmiletris
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksmiletris
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ksnake
@@ -1275,20 +918,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/ksnake
 %{tde_tdedocdir}/HTML/en/ksnake/
 
-%post -n trinity-ksnake
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksnake
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ksokoban
@@ -1324,20 +953,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/ksokoban
 %{tde_tdedocdir}/HTML/en/ksokoban/
 
-%post -n trinity-ksokoban
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksokoban
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kspaceduel
@@ -1363,20 +978,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/kspaceduel.kcfg
 %{tde_tdedocdir}/HTML/en/kspaceduel/
 
-%post -n trinity-kspaceduel
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kspaceduel
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ktron
@@ -1398,20 +999,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/ktron.kcfg
 %{tde_tdedocdir}/HTML/en/ktron/
 
-%post -n trinity-ktron
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktron
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-ktuberling
@@ -1446,20 +1033,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/mimelnk/application/x-tuberling.desktop
 %{tde_tdedocdir}/HTML/en/ktuberling/
 
-%post -n trinity-ktuberling
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktuberling
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-twin4
@@ -1490,20 +1063,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/twin4.desktop
 %{tde_tdedocdir}/HTML/en/twin4/
 
-%post -n trinity-twin4
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-twin4
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-lskat
@@ -1531,20 +1090,6 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/lskat.desktop
 %{tde_tdedocdir}/HTML/en/lskat/
 
-%post -n trinity-lskat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-lskat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1557,52 +1102,51 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %prep
 %setup -q -n %{name}-%{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"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export TDEDIR="%{tde_prefix}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-setgid
-
-# WTF hack for RHEL4
-%if 0%{?rhel} == 4
-mkdir atlantik/libatlantic/.libs
-ln -s . atlantik/libatlantic/.libs/.libs
-%endif
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
@@ -1649,5 +1193,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec
index a362c1407..0b457e10a 100644
--- a/redhat/main/tdegames/tdegames-3.5.13.2.spec
+++ b/redhat/main/tdegames/tdegames-3.5.13.2.spec
@@ -1,50 +1,81 @@
-# 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 tdegames (version 3.5.13-SRU)
+#
+# 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_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdegames
+%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_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
-Name:			trinity-tdegames
+Name:			trinity-%{tde_pkg}
 Summary:		Trinity Desktop Environment - Games
 Version:		%{tde_version}
-Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
+Group:			System/GUI/Other
+URL:			http://www.trinitydesktop.org/
 
-License:		GPLv2
-Group:			Amusements/Games
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
+
 BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
 BuildRequires:	libtool
 
-BuildRequires:	qt3-devel >= 3.3.8.d
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
+# 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
 
 Obsoletes:		trinity-kdegames < %{version}-%{release}
 Provides:		trinity-kdegames = %{version}-%{release}
@@ -99,8 +130,7 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
 
 %package devel
 Summary:	Development files for %{name} 
-Group:		Development/Libraries
-License:	LGPLv2
+Group:		Amusements/Games/Other
 
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
@@ -112,8 +142,6 @@ Obsoletes:		trinity-kdegames-devel < %{version}-%{release}
 Provides:		trinity-kdegames-devel = %{version}-%{release}
 
 %description devel
-%{summary}.
-
 Install %{name}-devel if you wish to develop or compile games for the
 TDE desktop.
 
@@ -124,7 +152,7 @@ TDE desktop.
 
 %package -n trinity-libtdegames1
 Summary:	Trinity games library and common files
-Group:		Amusements/Games
+Group:		Amusements/Games/Other
 
 %description -n trinity-libtdegames1
 This library provides a common infrastructure for several of the
@@ -137,10 +165,11 @@ This package is part of TDE, and a component of the TDE games module.
 %files -n trinity-libtdegames1
 %defattr(-,root,root,-)
 %{tde_libdir}/libkdegames.so.*
+%dir %{tde_datadir}/apps/kdegames
+%dir %{tde_datadir}/apps/kdegames/pics
 %{tde_datadir}/apps/kdegames/pics/star.png
 %{tde_datadir}/icons/crystalsvg/*/actions/roll.png
 %{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
-#%{tde_tdedocdir}/HTML/en/%{name}-%{version}-apidocs/
 
 %post -n trinity-libtdegames1
 for f in crystalsvg ; do
@@ -160,7 +189,7 @@ done
 
 %package -n trinity-libtdegames-devel
 Summary:	Trinity games library headers
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libtdegames1 = %{version}-%{release}
 
 %description -n trinity-libtdegames-devel
@@ -180,7 +209,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %package card-data
 Summary:	Card decks for Trinity games
-Group:		Amusements/Games
+Group:		Amusements/Games/Other
 
 %description card-data
 Several different collections of card images for use by TDE games.
@@ -189,13 +218,13 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %files card-data
 %defattr(-,root,root,-)
-%{tde_datadir}/apps/carddecks/*
+%{tde_datadir}/apps/carddecks/
 
 ##########
 
 %package -n trinity-atlantik
 Summary:	TDE client for Monopoly-like network games
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-atlantik
 This is a TDE client for playing Monopoly-like boardgames on the
@@ -240,7 +269,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-atlantik-devel
 Summary:	Development files for Atlantik
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-atlantik = %{version}-%{release}
 
 %description -n trinity-atlantik-devel
@@ -270,7 +299,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %package -n trinity-kasteroids
 Summary:	Asteroids for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kasteroids
 You know this game.  It is based on Warwick Allison's QwSpriteField
@@ -309,7 +338,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-katomic
 Summary:	Atomic Entertainment game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-katomic
 This is a puzzle game, in which the object is to assemble a molecule
@@ -345,7 +374,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kbackgammon
 Summary:	A Backgammon game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kbackgammon
 KBackgammon is a backgammon program for Trinity. It is based on the
@@ -383,7 +412,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kbattleship
 Summary:	Battleship game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kbattleship
 This is an implementation of the Battleship game.  Each player tries
@@ -420,7 +449,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kblackbox
 Summary:	A simple logical game for the Trinity project
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kblackbox
 KBlackBox is a game of hide and seek played on an grid of boxes. Your
@@ -458,7 +487,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kbounce
 Summary:	Jezzball clone for the K Desktop Environment
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kbounce
 This is a clone of the popular Jezzball game originally created by
@@ -506,7 +535,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kenolaba
 Summary:	Enolaba board game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kenolaba
 kenolaba is a simple board strategy game that is played by two
@@ -546,7 +575,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kfouleggs
 Summary:	A TDE clone of the Japanese PuyoPuyo game
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kfouleggs
 KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
@@ -583,7 +612,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kgoldrunner
 Summary:	A Trinity clone of the Loderunner arcade game
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kgoldrunner
 KGoldrunner, a game of action and puzzle solving.  Run through the
@@ -629,7 +658,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kjumpingcube
 Summary:	Tactical one or two player game
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-kjumpingcube
 KJumpingCube is a simple tactical game. You can play it against the
@@ -668,7 +697,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-klickety
 Summary:	A Clickomania-like game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-klickety
 Klickety is an adaptation of the (perhaps) well-known Clickomania
@@ -682,8 +711,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/klickety.desktop
 %{tde_datadir}/icons/hicolor/*/apps/klickety.png
 %{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
-%{tde_datadir}/apps/klickety/klicketyui.rc
-%{tde_datadir}/apps/klickety/eventsrc
+%{tde_datadir}/apps/klickety/
 %{tde_tdedocdir}/HTML/en/klickety/
 
 %post -n trinity-klickety
@@ -704,7 +732,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-klines
 Summary:	Color lines for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-klines
 KLines is a simple game. It is played by one player, so there is only
@@ -747,8 +775,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-kmahjongg
-Summary:	the classic mahjongg game for Trinity project
-Group:		Amusements/Games
+Summary:	The classic mahjongg game for Trinity project
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kmahjongg
 Your mission in this game is to remove all tiles from the game board. A
@@ -784,7 +812,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kmines
 Summary:	Minesweeper for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kmines
 KMines is the classic Minesweeper game. You must uncover all the
@@ -824,7 +852,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-knetwalk
 Summary:	A game for system administrators
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-knetwalk
 This game presents the player with a rectangular field consisting of
@@ -859,7 +887,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kolf
 Summary:	Minigolf game for TDE
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kolf
 This is a minigolf game for TDE that allows you to go through different
@@ -904,7 +932,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kolf-devel
 Summary:	Development files for Kolf
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kolf = %{version}-%{release}
 
 %description -n trinity-kolf-devel
@@ -929,7 +957,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %package -n trinity-konquest
 Summary:	TDE based GNU-Lactic Konquest game
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-konquest
 This the TDE version of Gnu-Lactic Konquest, a multi-player strategy
@@ -964,7 +992,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kpat
 Summary:	Trinity solitaire patience game
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Card
 
 %description -n trinity-kpat
 KPatience is a collection of 14 card games. All the games are single
@@ -998,7 +1026,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kpoker
 Summary:	Trinity based Poker clone
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Card
 
 %description -n trinity-kpoker
 KPoker is a TDE compliant clone of those highly addictive pocket
@@ -1032,7 +1060,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kreversi
 Summary:	Reversi for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kreversi
 Reversi is a simple strategy game that is played by two
@@ -1075,7 +1103,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksame
 Summary:	SameGame for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-ksame
 KSame is a simple game. It's played by one player, so there is only
@@ -1089,7 +1117,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %defattr(-,root,root,-)
 %{tde_bindir}/ksame
 %{tde_datadir}/icons/hicolor/*/apps/ksame.png
-%{tde_datadir}/apps/ksame/*
+%{tde_datadir}/apps/ksame/
 %{tde_tdeappdir}/ksame.desktop
 %{tde_tdedocdir}/HTML/en/ksame/
 
@@ -1111,7 +1139,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kshisen
 Summary:	Shisen-Sho for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kshisen
 KShisen-Sho is a single-player-game similar to Mahjongg and uses the
@@ -1148,7 +1176,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksirtet
 Summary:	Tetris and Puyo-Puyo games for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-ksirtet
 This program is a clone of the well known game Tetris. You must fit
@@ -1189,7 +1217,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksmiletris
 Summary:	Tetris like game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ksmiletris
 This is a game with falling blocks composed of different types of
@@ -1224,7 +1252,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksnake
 Summary:	Snake Race for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ksnake
 Snake Race is a game of speed and agility. You are a hungry snake and
@@ -1259,7 +1287,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksokoban
 Summary:	Sokoban game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-ksokoban
 The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
@@ -1308,7 +1336,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kspaceduel
 Summary:	Arcade two-player space game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kspaceduel
 KSpaceduel is an space arcade game for two players.
@@ -1347,7 +1375,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ktron
 Summary:	Tron clone for the K Desktop Environment
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ktron
 The object of the game is to avoid running into walls, your own tail,
@@ -1382,7 +1410,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ktuberling
 Summary:	Potato Guy for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ktuberling
 KTuberling is a game intended for small children. Of course, it may
@@ -1430,7 +1458,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-twin4
 Summary:	Connect Four clone for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-twin4
 Four wins is a game for two players. Each player is represented by a
@@ -1474,7 +1502,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-lskat
 Summary:	Lieutnant Skat card game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Card
 
 %description -n trinity-lskat
 Lieutnant Skat (from German Offiziersskat) is a card game for two
@@ -1513,7 +1541,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -1524,12 +1552,13 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %setup -q -n %{name}-%{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 || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 
 # Do not build against any "/usr" installed KDE
@@ -1537,7 +1566,7 @@ export KDEDIR="%{tde_prefix}"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
@@ -1571,17 +1600,48 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kasteroids      Game ArcadeGame
+%suse_update_desktop_file -r KGoldrunner     Game ArcadeGame
+%suse_update_desktop_file -r ksnake          Game ArcadeGame
+%suse_update_desktop_file -r kspaceduel      Game ArcadeGame
+%suse_update_desktop_file -r ktron           Game ArcadeGame
+%suse_update_desktop_file -r kfouleggs       Game BlocksGame
+%suse_update_desktop_file -r ksirtet         Game BlocksGame
+%suse_update_desktop_file -r klickety        Game BoardGame
+%suse_update_desktop_file -r ksmiletris      Game BlocksGame
+%suse_update_desktop_file -r ktuberling      Game KidsGame
+%suse_update_desktop_file -r atlantik        Game BoardGame
+%suse_update_desktop_file -r kbackgammon     Game BoardGame
+%suse_update_desktop_file -r kbattleship     Game BoardGame
+%suse_update_desktop_file -r kblackbox       Game BoardGame
+%suse_update_desktop_file -r kenolaba        Game BoardGame
+%suse_update_desktop_file -r kmahjongg       Game BoardGame
+%suse_update_desktop_file -r kreversi        Game BoardGame
+%suse_update_desktop_file -r kshisen         Game BoardGame
+%suse_update_desktop_file -r kwin4           Game BoardGame
+%suse_update_desktop_file -r kpat            Game CardGame
+%suse_update_desktop_file -r kpoker          Game CardGame
+%suse_update_desktop_file -r lskat           Game CardGame
+%suse_update_desktop_file -r katomic         Game LogicGame
+%suse_update_desktop_file -r kjumpingcube    Game LogicGame
+%suse_update_desktop_file -r klines          Game LogicGame
+%suse_update_desktop_file -r -G "Tactical Game" knetwalk Game LogicGame
+%suse_update_desktop_file -r kmines          Game LogicGame
+%suse_update_desktop_file -r konquest        Game LogicGame
+%suse_update_desktop_file -r ksame           Game LogicGame
+%suse_update_desktop_file -r ksokoban        Game LogicGame
+%suse_update_desktop_file -r kbounce         Game LogicGame
+%suse_update_desktop_file -r kolf            Game SportsGame
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}"
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdegames/trinity-tdegames-rpmlintrc b/redhat/main/tdegames/trinity-tdegames-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdegames/trinity-tdegames-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)