RPM: update spec files for TDE 14.0.7

12 files changed, 34 insertions, 73 deletions

diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index a0abf2cf5..538376224 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_prefix /opt/trinity
 
diff --git a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec b/redhat/extras/icons-nuvola/icons-nuvola.spec
index f3547a475..eff4527e3 100644
--- a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec
+++ b/redhat/extras/icons-nuvola/icons-nuvola.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg icons-nuvola
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/kdevmon/kdevmon-14.0.0.spec b/redhat/extras/kdevmon/kdevmon.spec
index d06d0c0ea..b2aab09f9 100644
--- a/redhat/extras/kdevmon/kdevmon-14.0.0.spec
+++ b/redhat/extras/kdevmon/kdevmon.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg kdevmon
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/klibido/klibido-14.0.0.spec b/redhat/extras/klibido/klibido.spec
index be9338c85..86a8323cd 100644
--- a/redhat/extras/klibido/klibido-14.0.0.spec
+++ b/redhat/extras/klibido/klibido.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg klibido
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/kompose/kompose-14.0.0.spec b/redhat/extras/kompose/kompose.spec
index 74719a3bf..eb86cbeb7 100644
--- a/redhat/extras/kompose/kompose-14.0.0.spec
+++ b/redhat/extras/kompose/kompose.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg kompose
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/koverartist/koverartist-14.0.0.spec b/redhat/extras/koverartist/koverartist.spec
index d638d93a2..84c199bb2 100644
--- a/redhat/extras/koverartist/koverartist-14.0.0.spec
+++ b/redhat/extras/koverartist/koverartist.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg koverartist
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman.spec
index 64b54ba35..f52e1c076 100644
--- a/redhat/extras/kpacman/kpacman-14.0.0.spec
+++ b/redhat/extras/kpacman/kpacman.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg kpacman
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec b/redhat/extras/style-ia-ora/style-ia-ora.spec
index bdf009862..351771520 100644
--- a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec
+++ b/redhat/extras/style-ia-ora/style-ia-ora.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define tde_pkg style-ia-ora
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -112,5 +112,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.8-4
-- Initial release for TDE 14.0.0
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 7a292aa39..05e45748c 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://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
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/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://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
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/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://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
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/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 f415f006a..7ce5d3e31 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://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
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/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://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
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/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://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
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/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.spec
index 430a7168a..5766196c3 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -15,11 +15,8 @@
 # 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
+%define tde_version 14.0.7
 %endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -64,8 +61,8 @@ Requires:	trinity-tdegraphics >= %{version}
 Requires:	trinity-tdemultimedia >= %{version}
 Requires:	trinity-tdenetwork >= %{version}
 Requires:	trinity-tdepim >= %{version}
-Requires:	trinity-tdeutils >= %{version}
 Requires:	trinity-tdetoys >= %{version}
+Requires:	trinity-tdeutils >= %{version}
 
 %if 0%{?rhel} || 0%{?fedora}
 # YUM configuration file
@@ -89,9 +86,6 @@ authentication, and much more!
 Group:		User Interface/Desktops
 Summary:	Meta-package to install TDE development tools
 
-Obsoletes:	trinity-desktop-dev < %{version}-%{release}
-Provides:	trinity-desktop-dev = %{version}-%{release}
-
 Requires:	trinity-tdesdk >= %{version}
 Requires:	trinity-tdevelop >= %{version}
 Requires:	trinity-tdewebdev >= %{version}
@@ -108,7 +102,6 @@ Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
 # Warning, k9copy requires ffmpeg
-# Warning, tderadio requires libmp3lame
 
 Requires: trinity-abakus
 Requires: trinity-amarok
@@ -118,6 +111,8 @@ 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
@@ -129,15 +124,19 @@ 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-keximdb
+Requires: trinity-kerberostray
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
+Requires: trinity-kima
 Requires: trinity-kiosktool
 Requires: trinity-kkbswitch
 Requires: trinity-klcddimmer
@@ -153,10 +152,9 @@ 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-kpilot
 Requires: trinity-krecipes
 Requires: trinity-krename
 Requires: trinity-krusader
@@ -170,22 +168,16 @@ Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
 Requires: trinity-ktorrent
-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
@@ -194,39 +186,17 @@ Requires: trinity-tdeio-ftps
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tdepowersave
 Requires: trinity-tderadio
+Requires: trinity-tdesudo
 Requires: trinity-tdesvn
+Requires: trinity-tellico
 Requires: trinity-tdmtheme
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
-# PCLinuxOS does not have sudo ...
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
-
-# 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%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6
@@ -235,8 +205,6 @@ Requires: trinity-knetworkmanager
 # Other distros use tdenetworkmanager (since R14)
 %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
@@ -248,11 +216,6 @@ Obsoletes: trinity-tde-guidance-powermanager
 #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} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-rosegarden
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index dc4ab5cdb..3385dd5c0 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin