Branch: master

e187705a 2015-11-07 08:32:15 François Andriot
RPM Packaging: update for 14.0.2
A redhat/applications/kooldock/kooldock.spec
A redhat/main/tdebase/pamd.kcheckpass-trinity.fc23
A redhat/main/tdebase/pamd.kdm-trinity-np.fc23
A redhat/main/tdebase/pamd.kdm-trinity.fc23
A redhat/main/tdebase/pamd.kscreensaver-trinity.fc23
A redhat/main/tdebase/tdm.service.fc23
A redhat/packages.f23
M redhat/Makefile.r14
M redhat/applications/abakus/abakus-14.0.0.spec
M redhat/applications/adept/adept-14.0.0.spec
M redhat/applications/amarok/amarok-14.0.0.spec
M redhat/applications/basket/basket-14.0.0.spec
M redhat/applications/bibletime/bibletime-14.0.0.spec
M redhat/applications/digikam/digikam-14.0.0.spec
M redhat/applications/dolphin/dolphin-14.0.0.spec
M redhat/applications/filelight/filelight-14.0.0.spec
M redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
M redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
M redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
M redhat/applications/gwenview/gwenview-14.0.0.spec
M redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
M redhat/applications/k3b/k3b-14.0.0.spec
M redhat/applications/k9copy/k9copy-14.0.0.spec
M redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
M redhat/applications/kaffeine/kaffeine-14.0.0.spec
M redhat/applications/kasablanca/kasablanca-14.0.0.spec
M redhat/applications/katapult/katapult-14.0.0.spec
M redhat/applications/kbarcode/kbarcode-14.0.0.spec
M redhat/applications/kbfx/kbfx-14.0.0.spec
M redhat/applications/kbibtex/kbibtex-14.0.0.spec
M redhat/applications/kbiff/kbiff-14.0.0.spec
M redhat/applications/kbookreader/kbookreader-14.0.0.spec
M redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
M redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
M redhat/applications/kcmldap/kcmldap-14.0.0.spec
M redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
M redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
M redhat/applications/kcpuload/kcpuload-14.0.0.spec
M redhat/applications/kdbg/kdbg-14.0.0.spec
M redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
M redhat/applications/kdiff3/kdiff3-14.0.0.spec
M redhat/applications/kdirstat/kdirstat-14.0.0.spec
M redhat/applications/keep/keep-14.0.0.spec
M redhat/applications/kerberostray/kerberostray-14.0.0.spec
M redhat/applications/kerry/kerry-14.0.0.spec
M redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
M redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
M redhat/applications/kile/kile-14.0.0.spec
M redhat/applications/kima/kima-14.0.0.spec
M redhat/applications/kiosktool/kiosktool-14.0.0.spec
M redhat/applications/kkbswitch/kkbswitch-14.0.0.spec
M redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
M redhat/applications/kmplayer/kmplayer-14.0.0.spec
M redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
M redhat/applications/kmymoney/kmymoney-14.0.0.spec
M redhat/applications/knemo/knemo-14.0.0.spec
M redhat/applications/knetload/knetload-14.0.0.spec
M redhat/applications/knetstats/knetstats-14.0.0.spec
M redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
M redhat/applications/knights/knights-14.0.0.spec
M redhat/applications/knmap/knmap-14.0.0.spec
M redhat/applications/knowit/knowit-14.0.0.spec
M redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
M redhat/applications/koffice/koffice-14.0.0.spec
M redhat/applications/konversation/konversation-14.0.0.spec
M redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
M redhat/applications/kpicosim/kpicosim-14.0.0.spec
M redhat/applications/kpilot/kpilot-14.0.0.spec
M redhat/applications/kpowersave/kpowersave-14.0.0.spec
M redhat/applications/krecipes/krecipes-14.0.0.spec
M redhat/applications/krename/krename-14.0.0.spec
M redhat/applications/krusader/krusader-14.0.0.spec
M redhat/applications/kscope/kscope-14.0.0.spec
M redhat/applications/ksensors/ksensors-14.0.0.spec
M redhat/applications/kshowmail/kshowmail-14.0.0.spec
M redhat/applications/kshutdown/kshutdown-14.0.0.spec
M redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
M redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
M redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
M redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
M redhat/applications/ktechlab/ktechlab-14.0.0.spec
M redhat/applications/ktorrent/ktorrent-14.0.0.spec
M redhat/applications/kuickshow/kuickshow-14.0.0.spec
M redhat/applications/kvirc/kvirc-14.0.0.spec
M redhat/applications/kvkbd/kvkbd-14.0.0.spec
M redhat/applications/kvpnc/kvpnc-14.0.0.spec
M redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
M redhat/applications/piklab/piklab-14.0.0.spec
M redhat/applications/potracegui/potracegui-14.0.0.spec
M redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
M redhat/applications/rosegarden/rosegarden-14.0.0.spec
M redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
M redhat/applications/smb4k/smb4k-14.0.0.spec
M redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
M redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
M redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
M redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
M redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
M redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
M redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
M redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
M redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
M redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
M redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
M redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
M redhat/applications/tderadio/tderadio-14.0.0.spec
M redhat/applications/tdesudo/tdesudo-14.0.0.spec
M redhat/applications/tdesvn/tdesvn-14.0.0.spec
M redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
M redhat/applications/tellico/tellico-14.0.0.spec
M redhat/applications/tork/tork-14.0.0.spec
M redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
M redhat/applications/wlassistant/wlassistant-14.0.0.spec
M redhat/applications/yakuake/yakuake-14.0.0.spec
M redhat/build/build_rpm_package.sh
M redhat/build/get_installed_package_version.sh
M redhat/build/get_rpm_package_name.sh
M redhat/build/get_spec_version.sh
M redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
M redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec
M redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
M redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
M redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
M redhat/libraries/libkipi/libkipi-14.0.0.spec
M redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
M redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
M redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
M redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
M redhat/libraries/python-trinity/python-trinity-14.0.0.spec
M redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
M redhat/main/tdeaddons/tdeaddons-14.0.0.spec
M redhat/main/tdeartwork/tdeartwork-14.0.0.spec
M redhat/main/tdebase/tdebase-14.0.0.spec
M redhat/main/tdegraphics/tdegraphics-14.0.0.spec
R redhat/applications/kasablanca/kasablanca-14.0.0.patch
R redhat/libraries/libksquirrel/libksquirrel-14.0.0.patch
R redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 71f42c3..9cd1df8 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -21,15 +21,18 @@
 
 
 all:	dependencies main libraries applications i18n meta extras
-dependencies:	tqt3 tqtinterface arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode
+dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
 main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries:	libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
+applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 extras:	icons-nuvola kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
 
 
 ### Trinity Dependencies
+akode:	tqtinterface trinity-filesystem
+	$(call buildpkg,dependencies/akode)
+
 arts:	tqtinterface trinity-filesystem esound cmake
 	$(call buildpkg,dependencies/arts)
 
@@ -141,8 +144,8 @@
 endif
 
 cmake:
-# Build on CentOS 5/6 only
-ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/cmake)
 endif
 
@@ -153,8 +156,8 @@
 endif
 
 esound:
-# Build on Mageia and CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
+# Build on Mageia and CentOS >= 7 and Fedora >= 23
+ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*  /boot/vmlinuz*.fc23*),)
 	$(call buildpkg,3rdparty/esound)
 endif
 
@@ -249,9 +252,6 @@
 endif
 
 ### Extra packages
-akode:	tqtinterface
-	$(call buildpkg,dependencies/akode)
-
 cmake-macros: cmake
 ifneq ($(wildcard /etc/SuSE-release),)
 	$(call buildpkg,extras/trinity-cmake-macros)
@@ -491,6 +491,9 @@
 konversation:	tdebase
 	$(call buildpkg,applications/konversation)
 
+kooldock:	tdebase
+	$(call buildpkg,applications/kooldock)
+
 kopete-otr:	tdebase
 	$(call buildpkg,applications/kopete-otr)
 
diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec
index 9b67dc2..c7dd138 100644
--- a/redhat/applications/abakus/abakus-14.0.0.spec
+++ b/redhat/applications/abakus/abakus-14.0.0.spec
@@ -35,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	0.91
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Calculator for TDE
 Group:		Applications/Utilities
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec
index ecadc8d..1fb2454 100644
--- a/redhat/applications/adept/adept-14.0.0.spec
+++ b/redhat/applications/adept/adept-14.0.0.spec
@@ -41,7 +41,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		Package management suite for Trinity
 Version:		2.1.3
-Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 10824b0..995a5c7 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -38,7 +38,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.4.10
-Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Media player for TDE
 Group:		Applications/Multimedia
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index f284a17..855e569 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -38,7 +38,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.0.3.1
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Taking care of your ideas
 Group:		Applications/Utilities
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index e1bb879..244e082 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -37,7 +37,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		1.6.6.0
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		A bible study tool for Trinity
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index b31c5af..0016394 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -37,7 +37,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		0.9.6
-Release:		%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		Digital photo management application for TDE
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/dolphin/dolphin-14.0.0.spec b/redhat/applications/dolphin/dolphin-14.0.0.spec
index 7406faf..03f9033 100644
--- a/redhat/applications/dolphin/dolphin-14.0.0.spec
+++ b/redhat/applications/dolphin/dolphin-14.0.0.spec
@@ -37,7 +37,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		0.9.2
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		File manager for TDE focusing on usability
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec
index c5b7d16..a93b655 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight-14.0.0.spec
@@ -38,7 +38,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		1.0
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		Graphical disk usage display
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
index 786a319..0672e67 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
@@ -38,7 +38,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		0.8
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		Theme engine using Qt for GTK+ 2.x and Trinity
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
index bab9c27..47778de 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
@@ -37,7 +37,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		0.5
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		GTK3 theme engine for TDE
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
index c8f336f..90a15eb 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
@@ -38,7 +38,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		1.4.2
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		Internationalization support for Gwenview [Trinity]
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec
index ea0406b..21940b4 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview-14.0.0.spec
@@ -38,7 +38,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		1.4.2
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		Gwenview is an image viewer for TDE.
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
index 7e3716d..4dcd317 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
@@ -38,7 +38,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		1.0.5
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		Internationalization support for TDE [Trinity]
 Group:			Applications/Archiving
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index c153e08..3cc53d9 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -39,7 +39,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		1.0.5
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:		CD/DVD burning application
 Group:			Applications/Archiving
 URL:			http://www.trinitydesktop.org/
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
 ** Diff limit reached (max: 250 lines) **