RPM: merge redhat directory with master branch

4 files changed, 127 insertions, 123 deletions

diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
index f3cb8e34f..7a292aa39 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-source
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
index c3450eaed..f415f006a 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index a93b07673..5a27ceb5e 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -1,23 +1,48 @@
+#
+# spec file for package trinity-desktop (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
 # Starting with TDE R14.0.0, TDE is not intended to run in RHEL4 and older.
 # Minimum (oldest) distribution supported is RHEL5.
 
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+
 # 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
 %define _docdir %{_datadir}/doc
 %define tde_datadir %{tde_prefix}/share
 %endif
 
 Name:		trinity-desktop
-Version:	14.0.0
-Release:	1%{?dist}%{?_variant}
-License:	GPL
+Version:	%{tde_version}
+Release:	1%{?dist}
 Summary:	Meta-package to install TDE
 Group:		User Interface/Desktops
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <[email protected]>
-URL:		http://www.trinitydesktop.org/
 
 Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,8 +118,6 @@ Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
 Requires: trinity-gwenview
-Requires: trinity-k3b
-Requires: trinity-k9copy
 Requires: trinity-kaffeine
 Requires: trinity-kaffeine-mozilla
 Requires: trinity-kasablanca
@@ -106,19 +129,15 @@ Requires: trinity-kbiff
 Requires: trinity-kbookreader
 Requires: trinity-kchmviewer
 Requires: trinity-kcmautostart
-Requires: trinity-kcmldap
-Requires: trinity-kcmldapcontroller
-Requires: trinity-kcmldapmanager
 Requires: trinity-kcpuload
 Requires: trinity-kdbg
 Requires: trinity-kdbusnotification
 Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
-Requires: trinity-kerberostray
+Requires: trinity-keximdb
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
-Requires: trinity-kima
 Requires: trinity-kiosktool
 Requires: trinity-kkbswitch
 Requires: trinity-klcddimmer
@@ -134,8 +153,10 @@ Requires: trinity-knmap
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
 Requires: trinity-konversation
+Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
+Requires: trinity-kplayer
 Requires: trinity-krecipes
 Requires: trinity-krename
 Requires: trinity-krusader
@@ -153,13 +174,18 @@ Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
 Requires: trinity-kvpnc
+Requires: trinity-kxmleditor
 Requires: trinity-mplayerthumbs
 Requires: trinity-piklab
 Requires: trinity-potracegui
 Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
+Requires: trinity-tastymenu
 Requires: trinity-tde-guidance
+Requires: trinity-tde-style-baghira
+Requires: trinity-tde-style-domino
+Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
@@ -171,7 +197,6 @@ Requires: trinity-tdeio-umountwrapper
 Requires: trinity-tderadio
 Requires: trinity-tdesvn
 Requires: trinity-tdmtheme
-Requires: trinity-tellico
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
@@ -182,27 +207,40 @@ Requires: trinity-yakuake
 Requires: trinity-tdesudo
 %endif
 
-# RHEL5: pilot library is too old
+# PCLinuxOS and RHEL 5 don't have heimdal ...
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?pclinuxos} == 0
+Requires: trinity-kcmldap
+Requires: trinity-kcmldapcontroller
+Requires: trinity-kcmldapmanager
+Requires: trinity-kerberostray
+%endif
+%endif
+
+# RHEL5: UDEV is too old
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires: trinity-k3b
+Requires: trinity-k9copy
+Requires: trinity-kima
 Requires: trinity-kpilot
+Requires: trinity-tellico
+Requires: trinity-tdepowersave
 %endif
 
 # Network management
 # RHEL 6 and openSUSE 11.x: knetworkmanager8
-%if 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140
+%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6
 Requires: trinity-knetworkmanager
 %endif
 # Other distros use tdenetworkmanager (since R14)
-%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-tdenetworkmanager
+Obsoletes: trinity-knetworkmanager
+Obsoletes: trinity-knetworkmanager8
 %endif
 
 # Power management
 Obsoletes: trinity-tde-guidance-powermanager
-Requires: trinity-tdepowersave
 
 # Decoration-related stuff (not installed by default)
 #Requires: trinity-kgtk-qt3
@@ -210,9 +248,13 @@ Requires: trinity-tdepowersave
 #Requires: trinity-gtk3-tqt-engine
 #Requires: trinity-qt4-tqt-theme-engine
 
+# Missing qalculate on older RHEL ...
+%if 0%{?rhel} == 0 || 0%{?rhel} >= 7
+Requires: trinity-qalculate-tde
+%endif
+
 # On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
-%if 0%{?rhel} == 5 || 0%{?rhel} == 7
-%else
+%if 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-rosegarden
 %endif
 
@@ -246,24 +288,28 @@ Requires: trinity-rosegarden
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all extras (unofficial) TDE packages
 
-Requires:	trinity-akode
-#Requires:	trinity-kdebluetooth
-#Requires:	trinity-kcheckgmail
 Requires:	trinity-icons-crystalsvg-updated
 Requires:	trinity-icons-kfaenza
+Requires:	trinity-icons-nuvola
 Requires:	trinity-icons-oxygen
-Requires:	trinity-kickoff-i18n
-#Requires:	trinity-knoda
-Requires:	trinity-style-ia-ora
+#Requires:	trinity-kickoff-i18n
+#Requires:	trinity-kcheckgmail
+#Requires:	trinity-kdebluetooth
+Requires:	trinity-kdevmon
+Requires:	trinity-kdissert
+Requires:	trinity-klamav
+Requires:	trinity-knoda
+Requires:	trinity-kompose
+Requires:	trinity-koverartist
+Requires:	trinity-kpacman
+Requires:	trinity-mathemagics
 #Requires:	trinity-tdeio-sysinfo-plugin
-Requires:	trinity-theme-baghira
 
-
-# GLIBC too old on RHEL <= 5
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-Requires:	trinity-twinkle
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires:	trinity-klibido
 %endif
 
+
 %description extras
 %{summary}
 
@@ -310,8 +356,10 @@ Requires(pre):	coreutils
 
 %prep
 
+
 %build
 
+
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p "%{?buildroot}%{_sysconfdir}/yum.repos.d"
@@ -344,5 +392,3 @@ Requires(pre):	coreutils
 
 
 %changelog
-* Mon Jun 03 2013 Francois Andriot <[email protected]> - 14.0.0-1
-- Initial build for TDE R14
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
index 3ebb6f2a1..80eef7416 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
@@ -1,13 +1,12 @@
 # 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
 %define _docdir %{_datadir}/doc
 %define tde_datadir %{tde_prefix}/share
 %endif
 
 Name:		trinity-desktop
 Version:	3.5.13.2
-Release:	2%{?dist}%{?_variant}
+Release:	2%{?dist}
 License:	GPL
 Summary:	Meta-package to install TDE
 Group:		User Interface/Desktops
@@ -80,27 +79,9 @@ Requires:	trinity-tdewebdev >= %{version}
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
-# Some applications are disabled for now ...
-# Compiz-related stuff does not work (obsolete)
-#Requires: trinity-compizconfig-backend-kconfig
-#Requires: trinity-desktop-effects-kde
-#Requires: trinity-fusion-icon
-
-# Obsolete l10n package
-#Requires: trinity-filelight-l10n
-
-# Not even an RPM package ...
-#Requires: trinity-konstruct
-
-# Debian/Ubuntu specific ...
-#Requires: trinity-adept
-
-# Future R14 packages
-#Requires: trinity-kvpnc
-#Requires: trinity-qt4-tqt-theme-engine
-
 # Warning, k9copy requires ffmpeg
 # Warning, tderadio requires libmp3lame
+
 Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
@@ -109,8 +90,8 @@ Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
 Requires: trinity-gwenview
-#Requires: trinity-gwenview-i18n
 Requires: trinity-k3b
+Requires: trinity-k9copy
 Requires: trinity-kaffeine
 Requires: trinity-kaffeine-mozilla
 Requires: trinity-katapult
@@ -119,7 +100,6 @@ Requires: trinity-kbfx
 Requires: trinity-kbookreader
 Requires: trinity-kchmviewer
 Requires: trinity-kcpuload
-Requires: trinity-k9copy
 Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
@@ -147,22 +127,22 @@ Requires: trinity-ktorrent
 Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
-Requires: trinity-twin-style-crystal
 Requires: trinity-piklab
 Requires: trinity-potracegui
 Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
 Requires: trinity-tde-guidance
-Requires: trinity-tde-guidance-powermanager
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tderadio
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
+Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
@@ -171,42 +151,46 @@ Requires: trinity-yakuake
 Requires: trinity-tdesudo
 %endif
 
-# Disabled applications for RHEL5
+# RHEL5: pilot library is too old
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires: trinity-kpilot
+%endif
+
+# Network management
+# RHEL 6 and openSUSE 11.x: knetworkmanager8
+%if 0%{?rhel} == 6
+Requires: trinity-knetworkmanager
+%endif
+%if 0%{?suse_version} && 0%{?suse_version} <= 1140
+Requires: trinity-knetworkmanager
+%endif
+
+# Power management
+Requires: trinity-tde-guidance-powermanager
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 # On RHEL 5, HAL version is too old for kpowersave .
 Requires: trinity-kpowersave
-# On RHEL 5, GTK2 version is too old for GTK stuff ...
-Requires: trinity-gtk-qt-engine
-# RHEL5: kpilot library is too old
-Requires: trinity-kpilot
 %endif
 
+# Decoration-related stuff (not installed by default)
+#Requires: trinity-kgtk-qt3
+#Requires: trinity-gtk-qt-engine
+#Requires: trinity-gtk3-tqt-engine
+#Requires: trinity-qt4-tqt-theme-engine
+
 # On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
 %if 0%{?rhel} == 5 || 0%{?rhel} == 7
 %else
 Requires: trinity-rosegarden
 %endif
 
-# On RHEL 7, lirc is not available, so not tderaiod :'-(
-%if 0%{?rhel} != 7
-Requires: trinity-tderadio
-%endif
-
-# This one causes several crashes . Obsolete.
-#Requires: trinity-kgtk-qt3
-#Obsoletes: trinity-kgtk-qt3
-
-# OBSOLETE: beagle does not exist anymore. Kerry is now useless.
-# RHEL, openSUSE 12: no Beagle library
-Obsoletes: trinity-kerry
+# Compiz-related stuff does not work (obsolete)
+#Requires: trinity-compizconfig-backend-kconfig
+#Requires: trinity-desktop-effects-kde
+#Requires: trinity-fusion-icon
 
-# RHEL 6 and openSUSE 11.x: knetworkmanager8
-%if 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140
-Requires: trinity-knetworkmanager
-%endif
+# Useless l10n package
+#Requires: trinity-filelight-l10n
 
 # RHEL 4
 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -216,7 +200,7 @@ Requires: trinity-kmplayer
 # No OTR support
 Requires: trinity-kopete-otr
 # No DBUS support
-Requires: trinity-kdbusnotification
+Requires: trinity-kdbusfnotification
 # Subversion 1.1 is too old
 Requires: trinity-tdesvn
 %endif
@@ -344,29 +328,3 @@ Requires(pre):	coreutils
 
 
 %changelog
-* Sun Jul 28 2013 Francois Andriot <[email protected]> - 3.5.13.2-2
-- Update for RHEL4
-
-* Mon Jun 03 2013 Francois Andriot <[email protected]> - 3.5.13.2-1
-- Update to version 3.5.13.2
-- Add GPG signing key
-
-* Mon Oct 01 2012 Francois Andriot <[email protected]> - 3.5.13.1-1
-- Update to version 3.5.13.1
-
-* Mon Aug 06 2012 Francois Andriot <[email protected]> - 3.5.13-6
-- Add 'applications' subpackage
-
-* Wed Aug 01 2012 Francois Andriot <[email protected]> - 3.5.13-5
-- Updates to reflect new packages names
-- Add Mageia 2 support
-- Removes 'extras' packages
-
-* Wed Jun 06 2012 Francois Andriot <[email protected]> - 3.5.13-4
-- Enable mirrorlist
-
-* Wed Nov 30 2011 Francois Andriot <[email protected]> - 3.5.13-3
-- Fix repo files name and content
-
-* Sat Nov 12 2011 Francois Andriot <[email protected]> - 3.5.13-2
-- Add 'repo' package