RPM: update all 'Obsoletes' and 'Provides' statement to avoid build warnings

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 129 insertions, 129 deletions

diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 838ab322c..9992b18d0 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -94,14 +94,14 @@ Source8:	tdm%{?dist}.te
 Source9:	mgabutton.svg
 %endif
 
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Provides:	trinity-kdebase-libs = %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
+Obsoletes:	trinity-kdebase < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # for set_permissions macro
 %if 0%{?suse_version}
@@ -813,38 +813,38 @@ BuildRequires:	selinux-policy-devel
 %endif
 
 # tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{version}-%{release}
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: %{name}-tdeio-pim-plugins = %{version}-%{release}
-Requires: trinity-kappfinder = %{version}-%{release}
-Requires: trinity-kate = %{version}-%{release}
-Requires: trinity-kwrite = %{version}-%{release}
-Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-tdepasswd = %{version}-%{release}
-Requires: trinity-tdeprint = %{version}-%{release}
-Requires: trinity-kdesktop = %{version}-%{release}
-Requires: trinity-tdm = %{version}-%{release}
-Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-khelpcenter = %{version}-%{release}
-Requires: trinity-kicker = %{version}-%{release}
-Requires: trinity-klipper = %{version}-%{release}
-Requires: trinity-kmenuedit = %{version}-%{release}
-Requires: trinity-konqueror = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
-Requires: trinity-konsole = %{version}-%{release}
-Requires: trinity-kpager = %{version}-%{release}
-Requires: trinity-kpersonalizer = %{version}-%{release}
-Requires: trinity-ksmserver = %{version}-%{release}
-Requires: trinity-ksplash = %{version}-%{release}
-Requires: trinity-ksysguard = %{version}-%{release}
-Requires: trinity-ksysguardd = %{version}-%{release}
-Requires: trinity-ktip = %{version}-%{release}
-Requires: trinity-twin = %{version}-%{release}
-Requires: trinity-libkonq = %{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{version}-%{release}
-Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
+Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kappfinder = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdeprint = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khelpcenter = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klipper = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmenuedit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konqueror-nsplugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konsole = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpersonalizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksmserver = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktip = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-smb-plugin = %{?epoch:%{epoch}:}%{version}-%{release}
  
 Requires:	trinity-arts >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs >= %{tde_version}
@@ -883,26 +883,26 @@ web browser, X terminal emulator, and many other programs and components.
 %package devel
 Summary:	%{summary} - Development files
 Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
-Requires:	%{name}-bin-devel = %{version}-%{release}
-Requires:	trinity-kate-devel = %{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{version}-%{release}
-Requires:	trinity-kicker-devel = %{version}-%{release}
-Requires:	trinity-konqueror-devel = %{version}-%{release}
-Requires:	trinity-ksplash-devel = %{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{version}-%{release}
-Requires:	trinity-libkonq-devel = %{version}-%{release}
-Requires:	trinity-tdm-devel = %{version}-%{release}
-Requires:	trinity-twin-devel = %{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
-Provides:	tdebase-devel = %{version}-%{release}
-Obsoletes:	tdebase-devel < %{version}-%{release}
+Requires:	%{name}-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kate-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kcontrol-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kdesktop-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kicker-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-konqueror-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksplash-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksysguard-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-twin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Provides:	trinity-kdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This is a meta-package that installs all tdebase development packages.
@@ -921,12 +921,12 @@ Kate plugins or TWin styles.
 Summary:	PIM TDEIOslaves from %{name}
 Group:		System/GUI/Other
 
-Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-pim-plugins < %{version}-%{release}
+Provides:	trinity-kdebase-pim-ioslaves = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-pim-ioslaves < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-pim-plugins
 Protocol handlers (TDEIOslaves) for personal information management, including:
@@ -960,8 +960,8 @@ Protocol handlers (TDEIOslaves) for personal information management, including:
 Summary:	Shared common files for Trinity and KDE4
 Group:		System/GUI/Other
 
-Provides:	tdebase-runtime-data-common = %{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
+Provides:	tdebase-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-runtime-data-common < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description runtime-data-common
 Shared common files for both Trinity and KDE4
@@ -987,7 +987,7 @@ Such as the desktop right-click-"Create New" list
 %package -n trinity-kappfinder
 Summary:	Non-TDE application finder for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kappfinder
 kappfinder searches your workstation for many common applications and
@@ -1019,9 +1019,9 @@ This package contains the kateinterface library.
 %package -n trinity-kate
 Summary:	Advanced text editor for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kwrite = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kate
 Kate is a multi document editor, based on a rewritten version of the kwrite
@@ -1064,7 +1064,7 @@ Some random features:
 %package -n trinity-kate-devel
 Summary:	Development files for kate
 Group:		Development/Libraries/Other
-Requires:	trinity-kate = %{version}-%{release}
+Requires:	trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kate-devel
 This package contains the development files fare Kate.
@@ -1082,8 +1082,8 @@ This package contains the development files fare Kate.
 %package -n trinity-kwrite
 Summary:	Advanced text editor for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kwrite
 Kwrite is an advanced text editor for TDE.
@@ -1107,7 +1107,7 @@ Kwrite is an advanced text editor for TDE.
 %package -n trinity-kcontrol
 Summary:	Control center for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Requires 'usb.ids'
 Requires:		usbutils
@@ -1412,7 +1412,7 @@ plugdev group.
 %package -n trinity-kcontrol-devel
 Summary:	Development files for kcontrol
 Group:		Development/Libraries/Other
-Requires:	trinity-kcontrol = %{version}-%{release}
+Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kcontrol-devel
 %{summary}.
@@ -1427,7 +1427,7 @@ Requires:	trinity-kcontrol = %{version}-%{release}
 %package bin
 Summary:	Core binaries for the TDE base module
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	pam
 %if 0%{?rhel} >= 7
 Requires:	xorg-x11-server-Xorg
@@ -1435,8 +1435,8 @@ Requires:	xorg-x11-drv-evdev
 Requires:	dejavu-sans-fonts
 %endif
 
-Provides:	tdebase-bin = %{version}-%{release}
-Obsoletes:	tdebase-bin < %{version}-%{release}
+Provides:	tdebase-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-bin < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description bin
 This package contains miscellaneous programs needed by other
@@ -1562,11 +1562,11 @@ TDE applications, particularly those in the TDE base module.
 %package bin-devel
 Summary:	Development files for core binaries for the TDE base module
 Group:		Development/Libraries/Other
-Requires:	%{name}-bin = %{version}-%{release}
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
-Obsoletes:	tdebase-bin-devel < %{version}-%{release}
-Provides:	tdebase-bin-devel = %{version}-%{release}
+Obsoletes:	tdebase-bin-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description bin-devel
 This package contains the development files for core binaries for 
@@ -1582,10 +1582,10 @@ the TDE base module
 %package data
 Summary:	Shared data files for the TDE base module
 Group:		System/GUI/Other
-Requires:	%{name}-runtime-data-common = %{version}-%{release}
+Requires:	%{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	tdebase-data < %{version}-%{release}
-Provides:	tdebase-data = %{version}-%{release}
+Obsoletes:	tdebase-data < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description data
 This package contains the architecture-independent shared data files
@@ -1880,7 +1880,7 @@ fi
 %package tdeio-plugins
 Summary:	Core I/O slaves for TDE
 Group:		System/GUI/Other
-Requires:	trinity-kdesktop = %{version}-%{release}
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	cyrus-sasl
 Requires:	psmisc
 %if 0%{?with_hal}
@@ -1892,10 +1892,10 @@ Requires:	cryptsetup
 Requires:	cryptsetup-luks
 %endif
 
-Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
-Provides:	tdebase-kio-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-plugins = %{version}-%{release}
+Obsoletes:	tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package includes the base tdeioslaves. They include, amongst many
@@ -2060,8 +2060,8 @@ group.
 Summary:	Password changer for TDE
 Group:		System/GUI/Other
 
-Obsoletes:	trinity-kdepasswd < %{version}-%{release}
-Provides:	trinity-kdepasswd = %{version}-%{release}
+Obsoletes:	trinity-kdepasswd < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdepasswd
 This is a simple application which allows users to change their
@@ -2111,7 +2111,7 @@ system passwords.
 %package -n trinity-tdeprint
 Summary:	Print system for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	psutils
 
 %description -n trinity-tdeprint
@@ -2173,9 +2173,9 @@ Installation of smbclient will make you able to use smb shared printers.
 %package -n trinity-kdesktop
 Summary:	Miscellaneous binaries and files for the TDE desktop
 Group:		System/GUI/Other
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	eject
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 Requires:	xdg-utils
@@ -2211,7 +2211,7 @@ the TDE desktop.
 %package -n trinity-kdesktop-devel
 Summary:	Development files for kdesktop
 Group:		Development/Libraries/Other
-Requires:	trinity-kdesktop = %{version}-%{release}
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kdesktop-devel
 This package contains the development files for kdesktop.
@@ -2227,8 +2227,8 @@ This package contains the development files for kdesktop.
 %package -n trinity-tdm
 Summary:	X Display manager for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	pam
 Requires:	logrotate
 
@@ -2428,7 +2428,7 @@ fi
 %package -n trinity-tdm-devel
 Summary:	Development files for tdm
 Group:		Development/Libraries/Other
-Requires:	trinity-tdm = %{version}-%{release}
+Requires:	trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-tdm-devel
@@ -2443,7 +2443,7 @@ This package contains the development files for TDM.
 %package -n trinity-kfind
 Summary:	File-find utility for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kfind
 kfind can be used to find files and directories on your
@@ -2466,7 +2466,7 @@ workstations.
 %package -n trinity-khelpcenter
 Summary:	Help center for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	htdig
 
 %description -n trinity-khelpcenter
@@ -2499,7 +2499,7 @@ documentation.
 %package -n trinity-kicker
 Summary:	Desktop panel for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kicker
 Kicker provides the TDE panel on you desktop. It can be used as a
@@ -2615,7 +2615,7 @@ functionality.
 %package -n trinity-kicker-devel
 Summary:	Development files for kicker
 Group:		Development/Libraries/Other
-Requires:	trinity-kicker = %{version}-%{release}
+Requires:	trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-kicker-devel
@@ -2641,7 +2641,7 @@ This package contains the development files for kicker.
 %package -n trinity-klipper
 Summary:	Clipboard utility for Trinity
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-klipper
 klipper provides standard clipboard functions (cut and paste, history
@@ -2674,7 +2674,7 @@ web browser if the clipboard contains a URL.
 %package -n trinity-kmenuedit
 Summary:	Menu editor for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kmenuedit
 The TDE menu editor allows you to make customisations to the TDE menu
@@ -2703,12 +2703,12 @@ structure.
 %package -n trinity-konqueror
 Summary:	TDE's advanced file manager, web browser and document viewer
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	trinity-kfind = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konqueror
 Konqueror is the file manager for the Trinity Desktop Environment.
@@ -2851,7 +2851,7 @@ fi
 %package -n trinity-konqueror-devel
 Summary:	Development files for konqueror
 Group:		Development/Libraries/Other
-Requires:	trinity-konqueror = %{version}-%{release}
+Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konqueror-devel
 This package contains the development files for konqueror.
@@ -2868,7 +2868,7 @@ This package contains the development files for konqueror.
 %package -n trinity-konqueror-nsplugins
 Summary:	Netscape plugin support for Konqueror
 Group:		System/GUI/Other
-Requires:	trinity-konqueror = %{version}-%{release}
+Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konqueror-nsplugins
 This package includes support for Netscape plugins in Konqueror.
@@ -2889,7 +2889,7 @@ This package includes support for Netscape plugins in Konqueror.
 %package -n trinity-konsole
 Summary:	X terminal emulator for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konsole
 Konsole is an X terminal emulation which provides a command-line interface
@@ -2942,7 +2942,7 @@ Using Konsole, a user can open:
 %package -n trinity-kpager
 Summary:	Desktop pager for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kpager
 This package contains TDE's desktop pager, which displays your virtual
@@ -2962,7 +2962,7 @@ applications. It is used to switch between applications or desktops.
 %package -n trinity-kpersonalizer
 Summary:	Installation personalizer for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kpersonalizer
 TDE Personalizer is the application that configures the TDE desktop for you.
@@ -2983,8 +2983,8 @@ automatically started. KPersonalizer can also be called later.
 %package -n trinity-ksmserver
 Summary:	Session manager for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-twin = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksmserver
 This package contains the TDE session manager. It is responsible for
@@ -3038,7 +3038,7 @@ update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.d
 %package -n trinity-ksplash
 Summary:	The TDE splash screen
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksplash
 This package includes the TDE Splash screen, which is seen when
@@ -3074,7 +3074,7 @@ a TDE session is launched.
 %package -n trinity-ksplash-devel
 Summary:	Development files for ksplash
 Group:		Development/Libraries/Other
-Requires:	trinity-ksplash = %{version}-%{release}
+Requires:	trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksplash-devel
 This package contains the development files for ksplash.
@@ -3090,8 +3090,8 @@ This package contains the development files for ksplash.
 %package -n trinity-ksysguard
 Summary:	System guard for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-ksysguardd = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksysguard
 TDE System Guard allows you to monitor various statistics about your
@@ -3116,7 +3116,7 @@ computer.
 %package -n trinity-ksysguard-devel
 Summary:	Development files for ksysguard
 Group:		Development/Libraries/Other
-Requires:	trinity-ksysguard = %{version}-%{release}
+Requires:	trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksysguard-devel
 This package contains the development files for ksysguard.
@@ -3132,7 +3132,7 @@ This package contains the development files for ksysguard.
 %package -n trinity-ksysguardd
 Summary:	System guard daemon for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksysguardd
 TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
@@ -3149,7 +3149,7 @@ to monitor it through the daemon running there.
 %package -n trinity-ktip
 Summary:	Useful tips for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ktip
 ktip provides many useful tips on using TDE when you log in.
@@ -3168,7 +3168,7 @@ ktip provides many useful tips on using TDE when you log in.
 %package -n trinity-twin
 Summary:	The TDE window manager
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-twin
 This package contains the default X window manager for TDE.
@@ -3221,7 +3221,7 @@ This package contains the default X window manager for TDE.
 %package -n trinity-twin-devel
 Summary:	Development files for twin
 Group:		Development/Libraries/Other
-Requires:	trinity-twin = %{version}-%{release}
+Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-twin-devel
 This package contains the development files for twin.
@@ -3273,8 +3273,8 @@ Konqueror and the kdesktop package.
 Summary:	Integration library between TQt3 and TDE
 Group:		System/GUI/Other
 
-Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{version}-%{release}
+Obsoletes:	tdebase-libtqt3-integration < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libtqt3-integration
 These libraries allow you to use TDE dialogs in native TQt3 applications.
@@ -3291,7 +3291,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 %package -n trinity-libkonq-devel
 Summary:	Development files for Konqueror's core libraries
 Group:		Development/Libraries/Other
-Requires:	trinity-libkonq = %{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-libkonq-devel