RPM Packaging: update tdeadmin

7 files changed, 85 insertions, 1577 deletions

diff --git a/redhat/tdeadmin/bp004-1f719050.diff b/redhat/tdeadmin/bp004-1f719050.diff
deleted file mode 100644
index 97e90ba30..000000000
--- a/redhat/tdeadmin/bp004-1f719050.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 1f71905047d874cdc6c63049e566a4d7b976b0fc
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327530712 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
-index e470a72..f5cb04c 100644
---- a/kcron/ctcron.cpp
-+++ b/kcron/ctcron.cpp
-@@ -178,7 +178,7 @@ istream& operator >> (istream& inputStream, CTCron& cron)
-     if ((line.find("#") == 0) && (line.find("\\") != 1))
-     {
-       // If the first 10 characters don't contain a character, it's probably a disabled entry.
--      int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ");
-+      int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
-       if (first_text < 0)
-          continue;
- 
-diff --git a/kuser/misc.cpp b/kuser/misc.cpp
-index 6b26a72..c16f563 100644
---- a/kuser/misc.cpp
-+++ b/kuser/misc.cpp
-@@ -135,7 +135,7 @@ void addShell(const TQString &shell)
- TQCString genSalt( int len )
- {
-   TQCString salt( len + 1 );
--  const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ0123456789./";
-+  const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
-     
-   salt[0] = set[getpid() % strlen(set)];
-   for( int i = 1; i < len; i++ ) {
diff --git a/redhat/tdeadmin/kdeadmin-3.5.12.spec b/redhat/tdeadmin/kdeadmin-3.5.12.spec
deleted file mode 100644
index 939c929de..000000000
--- a/redhat/tdeadmin/kdeadmin-3.5.12.spec
+++ /dev/null
@@ -1,197 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-%define console_helper 1
-
-Name:    trinity-kdeadmin
-Summary: Administrative tools for TDE
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
-
-License: GPLv2
-Group:   User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: kdeadmin-%{version}.tar.gz
-Source1: kuser.pam
-Source2: kuser.pamd
-Source5: kpackagerc
-Source6: ksysvrc
-Source7: kuserrc
-
-Requires: trinity-kdelibs
-Requires: pkgconfig
-%if 0%{?console_helper}
-Requires: usermode-gtk
-%endif
-
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: rpm-devel
-
-%description
-The kdeadmin package includes administrative tools for the K Desktop
-Environment (KDE) including:
-kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
-
-
-%prep
-%setup -q -n kdeadmin
-
-%if 0%{?rhel} > 1
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in
-  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE lilo-config"' >lilo-config/configure.in.in
-%endif
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%if 0%{?fedora} > 0
-export CXXFLAGS="${CXXFLAGS} -fpermissive"
-%endif
-
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --with-rpm \
-   --enable-final \
-   --with-private-groups \
-   --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%if 0%{?rhel} > 1
-comps="kcron kdat knetworkconf"
-rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \
-       %{buildroot}%{_docdir}/HTML/en/kpackage \
-       %{buildroot}%{_docdir}/HTML/en/ksysv \
-       %{buildroot}%{_docdir}/HTML/en/lilo-config       
-%else
-comps="kcron kdat knetworkconf kpackage ksysv kuser"
-mkdir -p %{buildroot}%{_datadir}/config \
-         %{buildroot}/etc/security/console.apps \
-         %{buildroot}/etc/pam.d \
-         %{buildroot}%{_sbindir}
-
-install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/
-
-# Run kuser through consolehelper
-install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
-install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
-mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
-ln -s consolehelper %{buildroot}%{_bindir}/kuser
-%endif
-
-# locale's
-%find_lang %{name} || touch %{name}.lang
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}/$HTML_DIR ]; then
-for lang_dir in %{buildroot}/$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in $comps ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-%post
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc rpmdocs/*
-%{_bindir}/*
-%if 0%{?rhel} < 1
-%{_sbindir}/*
-%config(noreplace) /etc/pam.d/*
-%config(noreplace) /etc/security/console.apps/*
-%{_datadir}/config*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/icons/crystalsvg/*/*/*
-%endif
-%{_datadir}/apps/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/service*/*.desktop
-%{tde_libdir}/*
-%{_libdir}/pkgconfig/*.pc
-
-
-
-
-%changelog
-* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add support for RHEL5
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial release for RHEL 6
-- Spec file based on Fedora 8 "kdeadmin-3.5.10-1"
-- Import to GIT
diff --git a/redhat/tdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch b/redhat/tdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch
deleted file mode 100644
index 9ba0d0d99..000000000
--- a/redhat/tdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch
+++ /dev/null
@@ -1,307 +0,0 @@
---- kdeadmin/knetworkconf/backends/service.pl.in.knetworkconf	2010-08-12 05:28:14.000000000 +0200
-+++ kdeadmin/knetworkconf/backends/service.pl.in	2012-05-03 11:09:05.093902723 +0200
-@@ -59,6 +59,9 @@
-        "redhat-8.0"   => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-        "redhat-9"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-        "openna-1.0"   => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+       
-+       "rhel-5"       => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+       "rhel-6"       => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- 
-        "mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-        "mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-@@ -110,6 +113,10 @@
-        "fedora-5"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-        "rpath"        => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- 
-+       "fedora-15"    => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+       "fedora-16"    => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+       "fedora-17"    => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+
-        "vine-3.0"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-        "vine-3.1"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-        "ark"          => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-@@ -139,6 +146,9 @@
-        "redhat-9"       => [3, 5],
-        "openna-1.0"     => [3, 5],
- 
-+       "rhel-5"         => [3, 5],
-+       "rhel-6"         => [3, 5],
-+
-        "mandrake-7.1"   => [3, 5],
-        "mandrake-7.2"   => [3, 5],
-        "mandrake-9.0"   => [3, 5],
-@@ -189,6 +199,10 @@
-        "fedora-4"       => [3, 5],
-        "fedora-5"       => [3, 5],
-        "rpath"          => [3, 5],
-+
-+       "fedora-15"      => [3, 5],
-+       "fedora-16"      => [3, 5],
-+       "fedora-17"      => [3, 5],
-        
-        "vine-3.0"       => [3, 5],
-        "vine-3.1"       => [3, 5],
-@@ -218,6 +232,9 @@
-      "redhat-9"       => "redhat-5.2",
-      "openna-1.0"     => "redhat-5.2",
-      
-+     "rhel-5"         => "redhat-5.2",
-+     "rhel-6"         => "redhat-5.2",
-+
-      "mandrake-7.1"   => "redhat-5.2",
-      "mandrake-7.2"   => "redhat-5.2",
-      "mandrake-9.0"   => "redhat-5.2",
-@@ -267,6 +284,10 @@
-      "fedora-5"       => "redhat-5.2",
-      "rpath"          => "redhat-5.2",
- 
-+     "fedora-15"      => "redhat-5.2",
-+     "fedora-16"      => "redhat-5.2",
-+     "fedora-17"      => "redhat-5.2",
-+
-      "vine-3.0"       => "redhat-5.2",
-      "vine-3.1"       => "redhat-5.2",
-      "ark"            => "redhat-5.2",
-@@ -1744,12 +1765,17 @@
-        "redhat-7.3"   => \&gst_service_redhat_get_status,
-        "redhat-8.0"   => \&gst_service_redhat_get_status,
-        "redhat-9"     => \&gst_service_redhat_get_status,
-+       "rhel-5"       => \&gst_service_redhat_get_status,
-+       "rhel-6"       => \&gst_service_redhat_get_status,
-        "mandrake-7.2" => \&gst_service_redhat_get_status,
-        "fedora-1"     => \&gst_service_redhat_get_status,
-        "fedora-2"     => \&gst_service_redhat_get_status,
-        "fedora-3"     => \&gst_service_redhat_get_status,
-        "fedora-4"     => \&gst_service_redhat_get_status,
-        "fedora-5"     => \&gst_service_redhat_get_status,
-+       "fedora-15"    => \&gst_service_redhat_get_status,
-+       "fedora-16"    => \&gst_service_redhat_get_status,
-+       "fedora-17"    => \&gst_service_redhat_get_status,
- 
-        "rpath"        => \&gst_service_redhat_get_status,
- 
---- kdeadmin/knetworkconf/backends/platform.pl.in.knetworkconf	2011-10-19 07:30:39.000000000 +0200
-+++ kdeadmin/knetworkconf/backends/platform.pl.in	2012-05-03 11:07:51.399862363 +0200
-@@ -71,6 +71,8 @@
-   "redhat-7.3"      => "Red Hat Linux 7.3 Valhalla",
-   "redhat-8.0"      => "Red Hat Linux 8.0 Psyche",
-   "redhat-9"        => "Red Hat Linux 9.0 Shrike",
-+  "rhel-5"          => "Enterprise Linux 5",
-+  "rhel-6"          => "Enterprise Linux 6",
-   "openna-1.0"      => "OpenNA Linux 1.0 VSLC",
-   "mandrake-7.1"    => "Linux Mandrake 7.1",
-   "mandrake-7.2"    => "Linux Mandrake 7.2 Odyssey",
-@@ -116,6 +118,9 @@
-   "fedora-3"        => "Fedora Core 3 (Heidelberg)",
-   "fedora-4"        => "Fedora Core 4 (Stentz)",
-   "fedora-5"        => "Fedora Core 5 (Bordeaux)",
-+  "fedora-15"       => "Fedora 15 (LoveLock)",
-+  "fedora-16"       => "Fedora 16 (Verne)",
-+  "fedora-17"       => "Fedora 17 (Beefy Miracle)",
-   "rpath"           => "rPath Linux",
-   "ark"             => "Ark Linux",
- };
-@@ -184,6 +189,27 @@
-   return -1;
- }
- 
-+sub check_rhel
-+{
-+  open RELEASE, "$gst_prefix/etc/redhat-release" or return -1;
-+  while (<RELEASE>)
-+  {
-+    chomp;
-+    if (
-+         (/^CentOS release (\d)([\d\.]+)\s+.*/)
-+      or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/)
-+      or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/)
-+    )
-+    {
-+      close RELEASE;
-+      return "rhel-$1";
-+    }
-+  }
-+  close RELEASE;
-+  return -1;
-+}
-+
-+
- sub check_openna
- {
-   open OPENNA, "$gst_prefix/etc/openna-release" or return -1;
-@@ -336,7 +362,10 @@
-       $ver = $_;
-       chomp ($ver);
- 
--      if ($ver =~ /^Fedora Core release (\S+)/)
-+      if (
-+         ($ver =~ /^Fedora Core release (\S+)/)
-+         or ($ver =~ /^Fedora release (\S+)/)
-+      )
-       {
-         close FEDORA;
-         return "fedora-$1";
-@@ -577,7 +606,7 @@
-   my %check = (
-     # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther
-     "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine,
--                 \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
-+                 \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna,
-                  \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ],
-     "FreeBSD" => [ \&check_freebsd ],
-     "SunOS"    => [ \&check_solaris ]
---- kdeadmin/knetworkconf/backends/network-conf.in.knetworkconf	2010-08-12 05:28:14.000000000 +0200
-+++ kdeadmin/knetworkconf/backends/network-conf.in	2012-05-03 11:04:14.035793003 +0200
-@@ -63,6 +63,7 @@
- $version = "@VERSION@";
- @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1",
-               "redhat-7.2", "redhat-8.0", "redhat-9",
-+              "rhel-5", "rhel-6",
-               "openna-1.0",
-               "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
-               "mandrake-10.0", "mandrake-10.1","mandrake-10.2", "mandriva-2006.0",
-@@ -72,7 +73,7 @@
-               "debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing",
-               "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10",
-               "suse-7.0", "suse-9.0", "suse-9.1",
--              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
-+              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16", "fedora-17",
-               "pld-1.0", "pld-1.1", "pld-1.99",
-               "conectiva-9", "conectiva-10",
-               "vine-3.0", "vine-3.1",
---- kdeadmin/knetworkconf/backends/network.pl.in.knetworkconf	2011-08-13 08:35:25.000000000 +0200
-+++ kdeadmin/knetworkconf/backends/network.pl.in	2012-05-03 11:05:51.621170496 +0200
-@@ -492,6 +492,8 @@
-        "redhat-7.2"   => "redhat-6.2",
-        "redhat-8.0"   => "redhat-6.2",
-        "redhat-9"     => "redhat-6.2",
-+       "rhel-5"       => "redhat-6.2",
-+       "rhel-6"       => "redhat-6.2",
-        "openna-1.0"   => "redhat-6.2",
-        "debian-2.2"   => "debian-2.2",
-        "debian-3.0"   => "debian-2.2",
-@@ -538,6 +540,9 @@
-        "fedora-3"     => "redhat-6.2",
-        "fedora-4"     => "redhat-6.2",
-        "fedora-5"     => "redhat-6.2",
-+       "fedora-15"    => "redhat-6.2",
-+       "fedora-16"    => "redhat-6.2",
-+       "fedora-17"    => "redhat-6.2",
-        "rpath"        => "redhat-6.2",
-        "vine-3.0"     => "redhat-6.2",
-        "vine-3.1"     => "redhat-6.2",
-@@ -1816,6 +1821,8 @@
-           "redhat-7.2"   => \&gst_network_rh72_get_file,
-           "redhat-8.0"   => \&gst_network_rh72_get_file,
-           "redhat-9"     => \&gst_network_rh72_get_file,
-+          "rhel-5"       => \&gst_network_rh72_get_file,
-+          "rhel-6"       => \&gst_network_rh72_get_file,
-           "openna-1.0"   => \&gst_network_rh62_get_file,
-           "mandrake-7.2" => \&gst_network_rh62_get_file,
-           "mandrake-7.1" => \&gst_network_rh62_get_file,
-@@ -1863,6 +1870,9 @@
-           "fedora-3"     => \&gst_network_rh72_get_file,
-           "fedora-4"     => \&gst_network_rh72_get_file,
-           "fedora-5"     => \&gst_network_rh72_get_file,
-+          "fedora-15"    => \&gst_network_rh72_get_file,
-+          "fedora-16"    => \&gst_network_rh72_get_file,
-+          "fedora-17"    => \&gst_network_rh72_get_file,
-           "rpath"        => \&gst_network_rh72_get_file,
-           "vine-3.0"     => \&gst_network_rh62_get_file,
-           "vine-3.1"     => \&gst_network_rh62_get_file,
-@@ -3961,6 +3971,8 @@
-           "redhat-7.2"   => "lo",
-           "redhat-8.0"   => "lo",
-           "redhat-9"     => "",
-+          "rhel-5"       => "",
-+          "rhel-6"       => "",
-           "openna-1.0"   => "lo",
-           "mandrake-7.1" => "lo",
-           "mandrake-7.2" => "lo",
-@@ -4008,6 +4020,9 @@
-           "fedora-3"     => "",
-           "fedora-4"     => "",
-           "fedora-5"     => "",
-+          "fedora-15"    => "",
-+          "fedora-16"    => "",
-+          "fedora-17"    => "",
-           "rpath"        => "",
-           "vine-3.0"     => "lo",
-           "vine-3.1"     => "lo",
-@@ -4150,6 +4165,8 @@
- 	  "redhat-7.2"   => "redhat-7.2",
-           "redhat-8.0"   => "redhat-7.2",
-           "redhat-9"     => "redhat-7.2",
-+          "rhel-5"       => "redhat-7.2",
-+          "rhel-6"       => "redhat-7.2",
- 	  "openna-1.0"   => "redhat-6.2",
- 	  "mandrake-7.1" => "redhat-6.2",
- 	  "mandrake-7.2" => "redhat-6.2",
-@@ -4197,6 +4214,9 @@
-           "fedora-3"     => "redhat-7.2",
-           "fedora-4"     => "redhat-7.2",
-           "fedora-5"     => "redhat-7.2",
-+          "fedora-15"    => "redhat-7.2",
-+          "fedora-16"    => "redhat-7.2",
-+          "fedora-17"    => "redhat-7.2",
-           "rpath"        => "redhat-7.2",
-           "vine-3.0"     => "redhat-7.0",
-           "vine-3.1"     => "redhat-7.0",
-@@ -4585,6 +4605,8 @@
- 	  "redhat-7.2"   => "redhat-7.2",
-           "redhat-8.0"   => "redhat-8.0",
-           "redhat-9"     => "redhat-8.0",
-+          "rhel-5"       => "redhat-8.0",
-+          "rhel-6"       => "redhat-8.0",
- 	  "openna-1.0"   => "redhat-6.2",
- 	  "mandrake-7.1" => "redhat-6.2",
-           "mandrake-7.2" => "redhat-6.2",
-@@ -4632,6 +4654,9 @@
-           "fedora-3"     => "redhat-7.2",
-           "fedora-4"     => "redhat-7.2",
-           "fedora-5"     => "redhat-7.2",
-+          "fedora-15"    => "redhat-7.2",
-+          "fedora-16"    => "redhat-7.2",
-+          "fedora-17"    => "redhat-7.2",
-           "rpath"        => "redhat-7.2",
-           "vine-3.0"     => "vine-3.0",
-           "vine-3.1"     => "vine-3.0",
-@@ -5445,6 +5470,8 @@
- 	  "redhat-7.2"   => "redhat-7.2",
-           "redhat-8.0"   => "redhat-7.2",
-           "redhat-9"     => "redhat-7.2",
-+          "rhel-5"     => "redhat-7.2",
-+          "rhel-6"     => "redhat-7.2",
- 	  "mandrake-7.1" => "redhat-6.2",
- 	  "mandrake-7.2" => "redhat-6.2",
- 	  "mandrake-9.0" => "redhat-7.0",
-@@ -5491,6 +5518,9 @@
-           "fedora-3"     => "redhat-7.2",
-           "fedora-4"     => "redhat-7.2",
-           "fedora-5"     => "redhat-7.2",
-+          "fedora-15"    => "redhat-7.2",
-+          "fedora-16"    => "redhat-7.2",
-+          "fedora-17"    => "redhat-7.2",
-           "rpath"        => "redhat-7.2",
-           "vine-3.0"     => "redhat-7.0",
-           "vine-3.1"     => "redhat-7.0",
-@@ -5872,6 +5902,8 @@
- 	  "redhat-7.2"   => "redhat-7.2",
-           "redhat-8.0"   => "redhat-8.0",
-           "redhat-9"     => "redhat-8.0",
-+          "rhel-5"       => "redhat-8.0",
-+          "rhel-6"       => "redhat-8.0",
- 	  "mandrake-7.1" => "redhat-6.2",
-           "mandrake-7.2" => "redhat-6.2",
-           "mandrake-9.0" => "mandrake-9.0",
-@@ -5918,6 +5950,9 @@
-           "fedora-3"     => "redhat-7.2",
-           "fedora-4"     => "redhat-7.2",
-           "fedora-5"     => "redhat-7.2",
-+          "fedora-15"    => "redhat-7.2",
-+          "fedora-16"    => "redhat-7.2",
-+          "fedora-17"    => "redhat-7.2",
-           "rpath"        => "redhat-7.2",
-           "vine-3.0"     => "vine-3.0",
-           "vine-3.1"     => "vine-3.0",
diff --git a/redhat/tdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch b/redhat/tdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch
deleted file mode 100644
index 77047f5f8..000000000
--- a/redhat/tdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit d3d702117d757d6c16d0dd41969bc44229123330
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331690654 -0500
-
-    Remove "More Applications" from TDE menu.
-    This partially resolves bug report 653.
-
-diff --git a/kdat/kdat.desktop b/kdat/kdat.desktop
-index 3aeb7ac..7016d05 100644
---- a/kdat/kdat.desktop
-+++ b/kdat/kdat.desktop
-@@ -89,4 +89,4 @@ X-KDE-StartupNotify=true
- DocPath=kdat/index.html
- Terminal=false
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;System;X-KDE-More;
-+Categories=Qt;KDE;System;
diff --git a/redhat/tdeadmin/kdeadmin-3.5.13.1.spec b/redhat/tdeadmin/kdeadmin-3.5.13.1.spec
deleted file mode 100644
index 864f3f000..000000000
--- a/redhat/tdeadmin/kdeadmin-3.5.13.1.spec
+++ /dev/null
@@ -1,482 +0,0 @@
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# 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 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_sbindir %{tde_prefix}/sbin
-%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-tdeadmin
-Summary:		Administrative tools for TDE
-Version:		3.5.13.1
-Release:		1%{?dist}%{?_variant}
-
-License:		GPLv2
-Group:			User Interface/Desktops
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-
-Obsoletes:		trinity-kdeadmin < %{version}-%{release}
-Provides:		trinity-kdeadmin = %{version}-%{release}
-
-Source0: kdeadmin-%{version}.tar.gz
-Source1: kuser.pam
-Source2: kuser.pamd
-Source5: kpackagerc
-Source6: ksysvrc
-Source7: kuserrc
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
-BuildRequires: rpm-devel
-BuildRequires: pam-devel
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	lilo
-%endif
-
-Requires: trinity-tdeadmin = %{version}-%{release}
-Requires: trinity-kcron = %{version}-%{release}
-Requires: trinity-kdat = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-knetworkconf = %{version}-%{release}
-Requires: trinity-kpackage = %{version}-%{release}
-Requires: trinity-ksysv = %{version}-%{release}
-Requires: trinity-kuser = %{version}-%{release}
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires: trinity-lilo-config = %{version}-%{release}
-%endif
-
-
-%description
-The tdeadmin package includes administrative tools for the Trinity Desktop
-Environment (TDE) including:
-kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
-
-%files
-%defattr(-,root,root,-)
-# LILO is not provided in RHEL or Fedora
-%if 0%{?rhel} || 0%{?fedora}
-%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
-%endif
-
-##########
-
-%package -n trinity-kcron
-Summary:	The Trinity crontab editor
-Group:		Applications/Utilities
-
-%description -n trinity-kcron
-KCron is an application for scheduling programs to run in the background.
-It is a graphical user interface to cron, the UNIX system scheduler.
-
-%files -n trinity-kcron
-%defattr(-,root,root,-)
-%{tde_bindir}/kcron
-%{tde_tdeappdir}/kcron.desktop
-%{tde_datadir}/apps/kcron/kcronui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kcron.png
-%{tde_tdedocdir}/HTML/en/kcron/
-
-%post -n trinity-kcron
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcron
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdat
-Summary:	A Trinity tape backup tool
-Group:		Applications/Utilities
-
-%description -n trinity-kdat
-KDat is a tar-based tape archiver. It is designed to work with multiple
-archives on a single tape.
-
-Main features are:
-* Simple graphical interface to local filesystem and tape contents.
-* Multiple archives on the same physical tape.
-* Complete index of archives and files is stored on local hard disk.
-* Selective restore of files from an archive.
-* Backup profiles for frequently used backups.
-
-%files -n trinity-kdat
-%defattr(-,root,root,-)
-%doc rpmdocs/kdat/*
-%{tde_bindir}/kdat
-%{tde_tdeappdir}/kdat.desktop
-%{tde_datadir}/apps/kdat/
-%{tde_datadir}/icons/hicolor/*/apps/kdat.png
-%{tde_datadir}/icons/locolor/*/apps/kdat.png
-%{tde_tdedocdir}/HTML/en/kdat/
-
-%post -n trinity-kdat
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdat
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	Trinity file metainfo plugins for deb and rpm files
-Group:		Environment/Libraries
-
-%description kfile-plugins
-File metainfo plugins for deb and rpm package files.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_deb.la
-%{tde_tdelibdir}/kfile_deb.so
-%{tde_tdelibdir}/kfile_rpm.la
-%{tde_tdelibdir}/kfile_rpm.so
-%{tde_datadir}/services/kfile_deb.desktop
-%{tde_datadir}/services/kfile_rpm.desktop
-
-##########
-
-%package -n trinity-knetworkconf
-Summary:	Trinity network configuration tool
-Group:		Applications/Utilities
-
-%description -n trinity-knetworkconf
-This is a TDE control center module to configure TCP/IP settings.  It
-can be used to manage network devices and settings for each device.
-
-%files -n trinity-knetworkconf
-%defattr(-,root,root,-)
-%doc rpmdocs/knetworkconf/*
-%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
-%{tde_datadir}/apps/knetworkconf/
-%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
-%{tde_tdelibdir}/kcm_knetworkconfmodule.so
-%{tde_tdelibdir}/kcm_knetworkconfmodule.la
-%{tde_tdedocdir}/HTML/en/knetworkconf/
-
-%post -n trinity-knetworkconf
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-knetworkconf
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-kpackage
-Summary:	Trinity package management tool
-Group:		Applications/Utilities
-
-%description -n trinity-kpackage
-This is a frontend to both .rpm and .deb package formats. It allows you
-to view currently installed packages, browse available packages, and
-install/remove them.
-
-%files -n trinity-kpackage
-%defattr(-,root,root,-)
-%doc rpmdocs/kpackage/*
-%{tde_bindir}/kpackage
-%{tde_tdeappdir}/kpackage.desktop
-%{tde_datadir}/apps/kpackage/
-%{tde_datadir}/config/kpackagerc
-%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
-%{tde_tdedocdir}/HTML/en/kpackage/
-
-%post -n trinity-kpackage
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpackage
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksysv
-Summary:	Trinity SysV-style init configuration editor
-Group:		Applications/Utilities
-
-%description -n trinity-ksysv
-This program allows you to edit your start and stop scripts using a
-drag and drop GUI.
-
-%files -n trinity-ksysv
-%defattr(-,root,root,-)
-%doc rpmdocs/ksysv/*
-%{tde_bindir}/ksysv
-%{tde_tdeappdir}/ksysv.desktop
-%{tde_datadir}/apps/ksysv/
-%{tde_datadir}/config/ksysvrc
-%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
-%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
-%{tde_datadir}/mimelnk/application/x-ksysv.desktop
-%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
-%{tde_tdedocdir}/HTML/en/ksysv/
-
-%post -n trinity-ksysv
-for icon_theme in crystalsvg hicolor  ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksysv
-for icon_theme in crystalsvg hicolor  ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kuser
-Summary:	Trinity user/group administration tool
-Group:		Applications/Utilities
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires:	usermode-gtk
-%else
-Requires:	usermode
-%endif
-
-%description -n trinity-kuser
-A user/group administration tool for TDE.
-
-%files -n trinity-kuser
-%defattr(-,root,root,-)
-%doc rpmdocs/kuser/*
-%{_sbindir}/kuser
-%{tde_bindir}/kuser
-%{tde_sbindir}/kuser
-%{tde_tdeappdir}/kuser.desktop
-%{tde_datadir}/apps/kuser/
-%{tde_datadir}/config/kuserrc
-%{tde_datadir}/config.kcfg/kuser.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kuser.png
-%{tde_tdedocdir}/HTML/en/kuser/
-%config(noreplace) /etc/pam.d/kuser
-%config(noreplace) /etc/security/console.apps/kuser
-
-%post -n trinity-kuser
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kuser
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%package -n trinity-lilo-config
-Summary:	Trinity frontend for lilo configuration
-Group:		Applications/Utilities
-Requires:	trinity-kcontrol
-Requires:	trinity-tdebase-bin
-#Requires:	lilo
-
-%description -n trinity-lilo-config
-lilo-config is a TDE based frontend to the lilo boot manager configuration.
-It runs out of the Trinity Control Center.
-
-If you want to use the menu entry to launch lilo-config, you need to install
-tdebase-bin since it uses the tdesu command to gain root privileges.
-
-%files -n trinity-lilo-config
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_lilo.la
-%{tde_tdelibdir}/kcm_lilo.so
-%{tde_tdeappdir}/lilo.desktop
-%{tde_tdedocdir}/HTML/en/lilo-config/
-
-%post -n trinity-lilo-config
-touch /etc/lilo.conf
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdeadmin-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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 || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Do not build against any "/usr" installed KDE
-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}"
-fi
-
-%configure \
-   --prefix=%{tde_prefix} \
-   --exec-prefix=%{tde_prefix} \
-   --bindir=%{tde_bindir} \
-   --sbindir=%{tde_sbindir} \
-   --libdir=%{tde_libdir} \
-   --datadir=%{tde_datadir} \
-   --includedir=%{tde_tdeincludedir} \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --with-rpm \
-   --with-pam=kde \
-   --with-shadow \
-   --with-private-groups \
-   --enable-final \
-   --enable-closure \
-   --with-private-groups \
-   --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-comps="kcron kdat knetworkconf kpackage ksysv kuser"
-%__mkdir_p	%{buildroot}%{tde_datadir}/config \
-			%{buildroot}%{_sysconfdir}/security/console.apps \
-			%{buildroot}%{_sysconfdir}/pam.d \
-			%{buildroot}%{tde_sbindir} \
-			%{buildroot}%{_sbindir}
-
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
-
-# Run kuser through consolehelper
-%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser
-%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser
-%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser
-%endif
-
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}/$HTML_DIR ]; then
-for lang_dir in %{buildroot}/$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in $comps ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-# The following files are not installed in any binary package.
-# This is deliberate.
-
-# - This file serves no purpose that we can see, and conflicts
-#   with GNOME system tools, so be sure to leave it out.
-%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc
-
-# Extract from changelog:
-# tdeadmin (4:3.5.5-2) unstable; urgency=low
-#  +++ Changes by Ana Beatriz Guerrero Lopez:
-#  * Removed useless program secpolicy. (Closes: #399426)
-%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdeadmin/kdeadmin-3.5.13.spec b/redhat/tdeadmin/kdeadmin-3.5.13.spec
deleted file mode 100644
index de6f0302e..000000000
--- a/redhat/tdeadmin/kdeadmin-3.5.13.spec
+++ /dev/null
@@ -1,506 +0,0 @@
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# 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 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_sbindir %{tde_prefix}/sbin
-%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}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-tdeadmin
-Summary:		Administrative tools for TDE
-Version:		3.5.13
-Release:		5%{?dist}%{?_variant}
-
-License:		GPLv2
-Group:			User Interface/Desktops
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-
-Obsoletes:		trinity-kdeadmin < %{version}-%{release}
-Provides:		trinity-kdeadmin = %{version}-%{release}
-
-Source0: kdeadmin-%{version}.tar.gz
-Source1: kuser.pam
-Source2: kuser.pamd
-Source5: kpackagerc
-Source6: ksysvrc
-Source7: kuserrc
-
-# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17 [Commit #59394e6b]
-Patch1:		kdeadmin-3.5.13-add_rhel_fedora.patch
-# [kdeadmin] Fix linear alphabet string errors [Commit #1f719050]
-Patch2:		bp004-1f719050.diff
-# [tdeadmin] Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
-Patch3:		kdeadmin-3.5.13-remove_more_applications_in_menu.patch
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: rpm-devel
-BuildRequires: pam-devel
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	lilo
-%endif
-
-Requires: trinity-tdeadmin = %{version}-%{release}
-Requires: trinity-kcron = %{version}-%{release}
-Requires: trinity-kdat = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-knetworkconf = %{version}-%{release}
-Requires: trinity-kpackage = %{version}-%{release}
-Requires: trinity-ksysv = %{version}-%{release}
-Requires: trinity-kuser = %{version}-%{release}
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires: trinity-lilo-config = %{version}-%{release}
-%endif
-
-
-%description
-The tdeadmin package includes administrative tools for the Trinity Desktop
-Environment (TDE) including:
-kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
-
-%files
-%defattr(-,root,root,-)
-# LILO is not provided in RHEL or Fedora
-%if 0%{?rhel} || 0%{?fedora}
-%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
-%endif
-
-##########
-
-%package -n trinity-kcron
-Summary:	The Trinity crontab editor
-Group:		Applications/Utilities
-
-%description -n trinity-kcron
-KCron is an application for scheduling programs to run in the background.
-It is a graphical user interface to cron, the UNIX system scheduler.
-
-%files -n trinity-kcron
-%defattr(-,root,root,-)
-%{tde_bindir}/kcron
-%{tde_tdeappdir}/kcron.desktop
-%{tde_datadir}/apps/kcron/kcronui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kcron.png
-%{tde_tdedocdir}/HTML/en/kcron/
-
-%post -n trinity-kcron
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcron
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdat
-Summary:	A Trinity tape backup tool
-Group:		Applications/Utilities
-
-%description -n trinity-kdat
-KDat is a tar-based tape archiver. It is designed to work with multiple
-archives on a single tape.
-
-Main features are:
-* Simple graphical interface to local filesystem and tape contents.
-* Multiple archives on the same physical tape.
-* Complete index of archives and files is stored on local hard disk.
-* Selective restore of files from an archive.
-* Backup profiles for frequently used backups.
-
-%files -n trinity-kdat
-%defattr(-,root,root,-)
-%doc rpmdocs/kdat/*
-%{tde_bindir}/kdat
-%{tde_tdeappdir}/kdat.desktop
-%{tde_datadir}/apps/kdat/
-%{tde_datadir}/icons/hicolor/*/apps/kdat.png
-%{tde_datadir}/icons/locolor/*/apps/kdat.png
-%{tde_tdedocdir}/HTML/en/kdat/
-
-%post -n trinity-kdat
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdat
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	Trinity file metainfo plugins for deb and rpm files
-Group:		Environment/Libraries
-
-%description kfile-plugins
-File metainfo plugins for deb and rpm package files.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_deb.la
-%{tde_tdelibdir}/kfile_deb.so
-%{tde_tdelibdir}/kfile_rpm.la
-%{tde_tdelibdir}/kfile_rpm.so
-%{tde_datadir}/services/kfile_deb.desktop
-%{tde_datadir}/services/kfile_rpm.desktop
-
-##########
-
-%package -n trinity-knetworkconf
-Summary:	Trinity network configuration tool
-Group:		Applications/Utilities
-
-%description -n trinity-knetworkconf
-This is a TDE control center module to configure TCP/IP settings.  It
-can be used to manage network devices and settings for each device.
-
-%files -n trinity-knetworkconf
-%defattr(-,root,root,-)
-%doc rpmdocs/knetworkconf/*
-%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
-%{tde_datadir}/apps/knetworkconf/
-%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
-%{tde_tdelibdir}/kcm_knetworkconfmodule.so
-%{tde_tdelibdir}/kcm_knetworkconfmodule.la
-%{tde_tdedocdir}/HTML/en/knetworkconf/
-
-%post -n trinity-knetworkconf
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-knetworkconf
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-kpackage
-Summary:	Trinity package management tool
-Group:		Applications/Utilities
-
-%description -n trinity-kpackage
-This is a frontend to both .rpm and .deb package formats. It allows you
-to view currently installed packages, browse available packages, and
-install/remove them.
-
-%files -n trinity-kpackage
-%defattr(-,root,root,-)
-%doc rpmdocs/kpackage/*
-%{tde_bindir}/kpackage
-%{tde_tdeappdir}/kpackage.desktop
-%{tde_datadir}/apps/kpackage/
-%{tde_datadir}/config/kpackagerc
-%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
-%{tde_tdedocdir}/HTML/en/kpackage/
-
-%post -n trinity-kpackage
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpackage
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksysv
-Summary:	Trinity SysV-style init configuration editor
-Group:		Applications/Utilities
-
-%description -n trinity-ksysv
-This program allows you to edit your start and stop scripts using a
-drag and drop GUI.
-
-%files -n trinity-ksysv
-%defattr(-,root,root,-)
-%doc rpmdocs/ksysv/*
-%{tde_bindir}/ksysv
-%{tde_tdeappdir}/ksysv.desktop
-%{tde_datadir}/apps/ksysv/
-%{tde_datadir}/config/ksysvrc
-%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
-%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
-%{tde_datadir}/mimelnk/application/x-ksysv.desktop
-%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
-%{tde_tdedocdir}/HTML/en/ksysv/
-
-%post -n trinity-ksysv
-for icon_theme in crystalsvg hicolor  ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksysv
-for icon_theme in crystalsvg hicolor  ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kuser
-Summary:	Trinity user/group administration tool
-Group:		Applications/Utilities
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	usermode-gtk
-%else
-Requires:	usermode
-%endif
-
-%description -n trinity-kuser
-A user/group administration tool for TDE.
-
-%files -n trinity-kuser
-%defattr(-,root,root,-)
-%doc rpmdocs/kuser/*
-%{_sbindir}/kuser
-%{tde_bindir}/kuser
-%{tde_sbindir}/kuser
-%{tde_tdeappdir}/kuser.desktop
-%{tde_datadir}/apps/kuser/
-%{tde_datadir}/config/kuserrc
-%{tde_datadir}/config.kcfg/kuser.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kuser.png
-%{tde_tdedocdir}/HTML/en/kuser/
-%config(noreplace) /etc/pam.d/kuser
-%config(noreplace) /etc/security/console.apps/kuser
-
-%post -n trinity-kuser
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kuser
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%package -n trinity-lilo-config
-Summary:	Trinity frontend for lilo configuration
-Group:		Applications/Utilities
-Requires:	trinity-kcontrol
-Requires:	trinity-tdebase-bin
-#Requires:	lilo
-
-%description -n trinity-lilo-config
-lilo-config is a TDE based frontend to the lilo boot manager configuration.
-It runs out of the Trinity Control Center.
-
-If you want to use the menu entry to launch lilo-config, you need to install
-tdebase-bin since it uses the tdesu command to gain root privileges.
-
-%files -n trinity-lilo-config
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_lilo.la
-%{tde_tdelibdir}/kcm_lilo.so
-%{tde_tdeappdir}/lilo.desktop
-%{tde_tdedocdir}/HTML/en/lilo-config/
-
-%post -n trinity-lilo-config
-touch /etc/lilo.conf
-%endif
-
-##########
-
-
-
-
-%prep
-%setup -q -n kdeadmin
-
-%patch1 -p1 -b .knetworkconf
-%patch2 -p1
-%patch3 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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 || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-   --prefix=%{tde_prefix} \
-   --exec-prefix=%{tde_prefix} \
-   --bindir=%{tde_bindir} \
-   --sbindir=%{tde_sbindir} \
-   --libdir=%{tde_libdir} \
-   --datadir=%{tde_datadir} \
-   --docdir=%{tde_docdir} \
-   --includedir=%{tde_tdeincludedir} \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --with-rpm \
-   --with-pam=kde \
-   --with-shadow \
-   --with-private-groups \
-   --enable-final \
-   --enable-closure \
-   --with-private-groups \
-   --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-comps="kcron kdat knetworkconf kpackage ksysv kuser"
-%__mkdir_p	%{buildroot}%{tde_datadir}/config \
-			%{buildroot}%{_sysconfdir}/security/console.apps \
-			%{buildroot}%{_sysconfdir}/pam.d \
-			%{buildroot}%{tde_sbindir} \
-			%{buildroot}%{_sbindir}
-
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
-
-# Run kuser through consolehelper
-%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser
-%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser
-%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser
-%endif
-
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}/$HTML_DIR ]; then
-for lang_dir in %{buildroot}/$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in $comps ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-# The following files are not installed in any binary package.
-# This is deliberate.
-
-# - This file serves no purpose that we can see, and conflicts
-#   with GNOME system tools, so be sure to leave it out.
-%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc
-
-# Extract from changelog:
-# tdeadmin (4:3.5.5-2) unstable; urgency=low
-#  +++ Changes by Ana Beatriz Guerrero Lopez:
-#  * Removed useless program secpolicy. (Closes: #399426)
-%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Fri Jul 13 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Renames 'trinity-kdeadmin' to 'trinity-tdeadmin'
-- Split in several packages
-- Fix configure options
-- Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
-
-* Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix knetworkconf support for Fedora, adds Fedora 17
-- Fix linear alphabet string errors [Commit #1f719050]
- 
-* Wed Jan 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Add knetworkconf support for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Remove 'consolehelper' macro
-- Enables all kdeadmin components in RHEL (no more exclude some tools)
-- Spec file cleanup
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Fri Oct 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
-
diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec
index 3e0bfeded..df7640de6 100644
--- a/redhat/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec
@@ -1,43 +1,58 @@
-# 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 tdeadmin (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_epoch 2
 %define tde_version 14.0.0
-
-# TDE specific building variables
+%define tde_pkg tdeadmin
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
-%define tde_sbindir %{tde_prefix}/sbin
 %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/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-tdeadmin
-Summary:		Administrative tools for TDE
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 
-License:		GPLv2
-Group:			User Interface/Desktops
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		trinity-%{tde_pkg}
+Summary:	Administrative tools for TDE
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Group:		System/GUI/Other
+URL:		http://www.trinitydesktop.org/
 
-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
 
-Prefix:			%{tde_prefix}
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Obsoletes:		trinity-kdeadmin < %{version}-%{release}
-Provides:		trinity-kdeadmin = %{version}-%{release}
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		kuser.pam
@@ -46,17 +61,39 @@ Source5:		kpackagerc
 Source6:		ksysvrc
 Source7:		kuserrc
 
-BuildRequires: autoconf automake libtool m4
+Obsoletes:		trinity-kdeadmin < %{version}-%{release}
+Provides:		trinity-kdeadmin = %{version}-%{release}
+
 BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	autoconf
+BuildRequires;	automake
+BuildRequires:	libtool
+BuildRequires:	m4
+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
+
+# RPM support
 BuildRequires: rpm-devel
+
+# PAM support
 BuildRequires: pam-devel
 
+# LILO support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 #define with_lilo 1
 %endif
-
 %if 0%{?with_lilo}
 BuildRequires:	lilo
 %endif
@@ -95,7 +132,7 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
 
 %package -n trinity-kcron
 Summary:	The Trinity crontab editor
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 
 %description -n trinity-kcron
 KCron is an application for scheduling programs to run in the background.
@@ -127,7 +164,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kdat
 Summary:	A Trinity tape backup tool
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 
 %description -n trinity-kdat
 KDat is a tar-based tape archiver. It is designed to work with multiple
@@ -168,7 +205,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package kfile-plugins
 Summary:	Trinity file metainfo plugins for deb and rpm files
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 %description kfile-plugins
 File metainfo plugins for deb and rpm package files.
@@ -186,7 +223,7 @@ File metainfo plugins for deb and rpm package files.
 
 %package -n trinity-knetworkconf
 Summary:	Trinity network configuration tool
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 
 %description -n trinity-knetworkconf
 This is a TDE control center module to configure TCP/IP settings.  It
@@ -222,7 +259,7 @@ done
 
 %package -n trinity-kpackage
 Summary:	Trinity package management tool
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 
 %description -n trinity-kpackage
 This is a frontend to both .rpm and .deb package formats. It allows you
@@ -257,7 +294,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksysv
 Summary:	Trinity SysV-style init configuration editor
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 
 %description -n trinity-ksysv
 This program allows you to edit your start and stop scripts using a
@@ -294,7 +331,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kuser
 Summary:	Trinity user/group administration tool
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 
 %if 0%{?with_consolehelper}
 # package 'usermode' provides '/usr/bin/consolehelper-gtk'
@@ -346,7 +383,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %if 0%{?with_lilo}
 %package -n trinity-lilo-config
 Summary:	Trinity frontend for lilo configuration
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	trinity-kcontrol
 Requires:	trinity-tdebase-bin
 #Requires:	lilo
@@ -371,7 +408,7 @@ touch /etc/lilo.conf
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -472,6 +509,18 @@ done
 %__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
 %endif
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kdat     System Backup
+%suse_update_desktop_file kpackage System PackageManager
+%suse_update_desktop_file kcron    System ServiceConfiguration
+%suse_update_desktop_file ksysv    System ServiceConfiguration
+%suse_update_desktop_file kuser    System SystemSetup
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{buildroot}