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

Signed-off-by: François Andriot <[email protected]>

1 files changed, 135 insertions, 135 deletions

diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index eb4c9e2d8..dd1e5ed05 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -190,43 +190,43 @@ BuildRequires:	xscreensaver-gl
 BuildRequires:	libacl-devel
 
 
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	%{name}-kfile-plugins = %{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	%{name}-wizards = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kalarm = %{version}-%{release}
-Requires:	trinity-kandy = %{version}-%{release}
-Requires:	trinity-karm = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-kmailcvt = %{version}-%{release}
-Requires:	trinity-kmobile = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-kode = %{version}-%{release}
-Requires:	trinity-konsolekalendar = %{version}-%{release}
-Requires:	trinity-kontact = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-korn = %{version}-%{release}
-Requires:	trinity-ktnef = %{version}-%{release}
-Requires:	trinity-libindex = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-Obsoletes:	trinity-kdepim < %{version}-%{release}
-Provides:	trinity-kdepim = %{version}-%{release}
-Obsoletes:	tdepim < %{version}-%{release}
-Provides:	tdepim = %{version}-%{release}
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-wizards = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kalarm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kandy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-karm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmailcvt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmobile = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-konsolekalendar = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korn = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 This metapackage includes a collection of Personal Information Management
@@ -241,35 +241,35 @@ This metapackage includes a collection of Personal Information Management
 Summary:	Development files for %{name}
 Group:		Development/Libraries/Other
 
-Obsoletes:	tdepim-cmake < %{version}-%{release}
-
-Obsoletes:	trinity-kdepim-devel < %{version}-%{release}
-Provides:	trinity-kdepim-devel = %{version}-%{release}
-Obsoletes:	tdepim-devel < %{version}-%{release}
-Provides:	tdepim-devel = %{version}-%{release}
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-akregator-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-kaddressbook-devel = %{version}-%{release}
-Requires:	trinity-karm-devel = %{version}-%{release}
-Requires:	trinity-kmail-devel = %{version}-%{release}
-Requires:	trinity-knode-devel = %{version}-%{release}
-Requires:	trinity-knotes-devel = %{version}-%{release}
-Requires:	trinity-kode-devel = %{version}-%{release}
-Requires:	trinity-kontact-devel = %{version}-%{release}
-Requires:	trinity-korganizer-devel = %{version}-%{release}
-Requires:	trinity-libindex-devel = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libkgantt-devel = %{version}-%{release}
-Requires:	trinity-libkleopatra-devel = %{version}-%{release}
-Requires:	trinity-libkmime-devel = %{version}-%{release}
-Requires:	trinity-libkpimexchange-devel = %{version}-%{release}
-Requires:	trinity-libkpimidentities-devel = %{version}-%{release}
-Requires:	trinity-libksieve-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-Requires:	trinity-libmimelib-devel = %{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{version}-%{release}
+Obsoletes:	tdepim-cmake < %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-karm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmail-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kontact-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libindex-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkgantt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkleopatra-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimidentities-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libksieve-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libmimelib-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This metapackage includes all development files for TDE PIM.
@@ -284,8 +284,8 @@ It also contains the CMAKE macros.
 %package -n trinity-akregator
 Summary:	RSS feed aggregator for TDE
 Group:		Applications/Internet
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-akregator
 aKregator is a fast, lightweight, and intuitive feed reader program
@@ -321,7 +321,7 @@ thousands of internet feeds in a quick, efficient, and familiar way.
 %package -n trinity-akregator-devel
 Summary:	Development files for trinity-akregator
 Group:		Development/Libraries/Other
-Requires:	trinity-akregator = %{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-akregator-devel
 %{summary}
@@ -338,7 +338,7 @@ Requires:	trinity-akregator = %{version}-%{release}
 Summary:	TDE addressbook application
 Group:		Applications/Communications
 Requires:	trinity-tdebase-tdeio-pim-plugins
-Requires:	%{name}-tderesources = %{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kaddressbook
 KAddressBook is the main address book application for TDE; it enables you
@@ -391,7 +391,7 @@ LDAP servers, and SQL databases.
 %package -n trinity-kaddressbook-devel
 Summary:	Development files for trinity-kaddressbook
 Group:		Development/Libraries/Other
-Requires:	trinity-kaddressbook = %{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kaddressbook-devel
 %{summary}
@@ -408,7 +408,7 @@ Requires:	trinity-kaddressbook = %{version}-%{release}
 %package -n trinity-kalarm
 Summary:	Trinity alarm message, command and email scheduler
 Group:		Applications/Communications
-Requires:	trinity-libkpimidentities = %{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kalarm
 KAlarm provides a graphical interface to schedule personal timed events -
@@ -510,7 +510,7 @@ Group:		Development/Libraries/Other
 Summary:	TDE File dialog plugins for palm and vcf files
 Group:		Environment/Libraries
 
-Obsoletes:	tdepim-kfile-plugins < %{version}-%{release}
+Obsoletes:	tdepim-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kfile-plugins
 File dialog plugins for palm and vcf files.
@@ -530,9 +530,9 @@ File dialog plugins for palm and vcf files.
 Summary:	Trinity PIM I/O Slaves
 Group:		Environment/Libraries
 
-Obsoletes:	tdepim-kio-plugins < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdepim-kio-plugins = %{version}-%{release}
+Obsoletes:	tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package includes the pim kioslaves. This includes imap4, sieve,
@@ -567,15 +567,15 @@ and mbox.
 %package tderesources
 Summary:	Trinity pim resource plugins
 Group:		Environment/Libraries
-#Requires:	trinity-kaddressbook = %{version}-%{release}
-#Requires:	trinity-korganizer = %{version}-%{release}
-#Requires:	trinity-knotes = %{version}-%{release}
+#Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libcaldav
 Requires:	libcarddav
 
-Obsoletes:	tdepim-kresources < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources < %{version}-%{release}
-Provides:	trinity-tdepim-kresources = %{version}-%{release}
+Obsoletes:	tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kresources = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tderesources
 This package includes several plugins needed to interface with groupware
@@ -685,13 +685,13 @@ tracking feature plans.
 %package tderesources-devel
 Summary:	Development files for tderesources
 Group:		Development/Libraries/Other
-Requires:	%{name}-tderesources = %{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libcaldav
 Requires:	libcarddav
 
-Obsoletes:	tdepim-tderesources-devel < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources-devel < %{version}-%{release}
-Provides:	trinity-tdepim-kresources-devel = %{version}-%{release}
+Obsoletes:	tdepim-tderesources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kresources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kresources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tderesources-devel
 %{summary}
@@ -754,7 +754,7 @@ Provides:	trinity-tdepim-kresources-devel = %{version}-%{release}
 Summary:	Trinity server configuration wizards
 Group:		Applications/Communications
 
-Obsoletes:	tdepim-wizards < %{version}-%{release}
+Obsoletes:	tdepim-wizards < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description wizards
 This package contains TDE-based wizards for configuring eGroupware,
@@ -862,7 +862,7 @@ keybox and for retrieving certificates from LDAP servers.
 %package -n trinity-kmail
 Summary:	Trinity Email client
 Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
 
 # GPG support
@@ -882,8 +882,8 @@ Requires:	pinentry
 %endif
 
 Requires:	procmail
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
 
 Provides: imap-client, mail-reader
@@ -975,7 +975,7 @@ Group:		Development/Libraries/Other
 %package -n trinity-kmailcvt
 Summary:	Trinity KMail mail folder converter
 Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kmailcvt
 Converts mail folders to KMail format.  Formats supported for import
@@ -1022,7 +1022,7 @@ signatures.
 %package -n trinity-knode-devel
 Summary:	Development files for trinity-knode
 Group:		Development/Libraries/Other
-Requires:	trinity-knode = %{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-knode-devel
 %{summary}
@@ -1037,7 +1037,7 @@ Requires:	trinity-knode = %{version}-%{release}
 %package -n trinity-knotes
 Summary:	Trinity sticky notes
 Group:		Applications/Utilities
-Requires:	trinity-tdepim-tderesources = %{version}-%{release}
+Requires:	trinity-tdepim-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-knotes
 KNotes is a program that lets you write sticky notes. The notes are saved
@@ -1066,8 +1066,8 @@ program.  The program supports printing and mailing your notes.
 %package -n trinity-knotes-devel
 Summary:	Development files for knots
 Group:		Development/Libraries/Other
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-knotes-devel
 %{summary}
@@ -1101,7 +1101,7 @@ described by RelaxNG schemes.
 %package -n trinity-kode-devel
 Summary:	Development files for trinity-kode
 Group:		Development/Libraries/Other
-Requires:	trinity-kode = %{version}-%{release}
+Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kode-devel
 %{summary}
@@ -1134,12 +1134,12 @@ frontend to manage your calendars.
 %package -n trinity-kontact
 Summary:	Trinity pim application
 Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kontact
 Kontact is the integrated solution to your personal information management
@@ -1192,7 +1192,7 @@ scheduling, address book and other PIM functionality.
 %package -n trinity-kontact-devel
 Summary:	Development files for kontact
 Group:		Development/Libraries/Other
-Requires:	trinity-kontact = %{version}-%{release}
+Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kontact-devel
 %{summary}
@@ -1210,9 +1210,9 @@ Requires:	trinity-kontact = %{version}-%{release}
 %package -n trinity-korganizer
 Summary:	Trinity personal organizer
 Group:		Applications/Productivity
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	%{name}-tderesources = %{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	perl
 
 %description -n trinity-korganizer
@@ -1270,7 +1270,7 @@ installed.
 %package -n trinity-korganizer-devel
 Summary:	Development files for korganizer
 Group:		Development/Libraries/Other
-Requires:	trinity-korganizer = %{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-korganizer-devel
 %{summary}
@@ -1295,7 +1295,7 @@ Requires:	trinity-korganizer = %{version}-%{release}
 %package -n trinity-korn
 Summary:	Trinity mail checker
 Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-korn
 Korn is a TDE mail checker that can display a small summary in the Kicker
@@ -1359,7 +1359,7 @@ This is the runtime package for programs that use the libindex library.
 %package -n trinity-libindex-devel
 Summary:	Trinity indexing library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libindex = %{version}-%{release}
+Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libindex-devel
 This library provides text indexing and is currently used by KMail
@@ -1380,8 +1380,8 @@ library.
 %package -n trinity-libkcal
 Summary:	Trinity calendaring library
 Group:		Environment/Libraries
-#Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
+#Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkcal
 This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1416,9 +1416,9 @@ This is the runtime package for programs that use the libkcal-trinity library.
 %package -n trinity-libkcal-devel
 Summary:	Trinity calendaring library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkcal-devel
 This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1443,11 +1443,11 @@ library.
 %package -n trinity-libtdepim
 Summary:	Trinity PIM library
 Group:		Environment/Libraries
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	libtdepim < %{version}-%{release}
-Provides:	libtdepim = %{version}-%{release}
+Obsoletes:	libtdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdepim
 This is the runtime package for programs that use the trinity-libtdepim library.
@@ -1471,11 +1471,11 @@ This is the runtime package for programs that use the trinity-libtdepim library.
 %package -n trinity-libtdepim-devel
 Summary:	Trinity PIM library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libtdepim = %{version}-%{release}
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
 
-Obsoletes:	libtdepim-devel < %{version}-%{release}
-Provides:	libtdepim-devel = %{version}-%{release}
+Obsoletes:	libtdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdepim-devel
 This is the development package which contains the headers for the libtdepim-trinity
@@ -1505,8 +1505,8 @@ This is the runtime package for programs that use the libkgantt-trinity library.
 %package -n trinity-libkgantt-devel
 Summary:	Trinity gantt charting library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkgantt-devel
 This is the development package which contains the headers for the libkgantt-trinity
@@ -1553,8 +1553,8 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
 %package -n trinity-libkleopatra-devel
 Summary:	Trinity GnuPG interface libraries [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkleopatra-devel
 This library is used by several TDE applications to interface to the
@@ -1597,7 +1597,7 @@ an object tree.
 %package -n trinity-libkmime-devel
 Summary:	Development files for libkmime
 Group:		Development/Libraries/Other
-Requires:	trinity-libkmime = %{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkmime-devel
 %{summary}
@@ -1628,9 +1628,9 @@ library.
 %package -n trinity-libkpimexchange-devel
 Summary:	Trinity PIM Exchange library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkpimexchange-devel
 This is the development package which contains the headers for the
@@ -1666,7 +1666,7 @@ library.
 %package -n trinity-libkpimidentities-devel
 Summary:	Development files for libkpimidentities
 Group:		Development/Libraries/Other
-Requires:	trinity-libkpimidentities = %{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkpimidentities-devel
 %{summary}
@@ -1695,8 +1695,8 @@ This is the runtime package for programs that use the libksieve-trinity library.
 %package -n trinity-libksieve-devel
 Summary:	Trinity mail/news message filtering library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libksieve-devel
 This is the development package which contains the headers for the libksieve-trinity
@@ -1731,8 +1731,8 @@ This is the runtime library for packages using the ktnef-trinity library.
 %package -n trinity-libktnef-devel
 Summary:	KTNEF handler library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libktnef-devel
 This library handles mail attachments using the TNEF format. These
@@ -1769,7 +1769,7 @@ This is the runtime package for programs that use the libmimelib-trinity library
 %package -n trinity-libmimelib-devel
 Summary:	Trinity mime library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libmimelib = %{version}-%{release}
+Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libmimelib-devel
 This library is used by several TDE applications to handle mime types.