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

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

1 files changed, 40 insertions, 40 deletions

diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec
index 882740b2f..97612f4f9 100644
--- a/redhat/main/tdesdk/tdesdk.spec
+++ b/redhat/main/tdesdk/tdesdk.spec
@@ -156,29 +156,29 @@ BuildRequires:	libtool-ltdl-devel
 %define build_kioslave 1
 %endif
 
-Obsoletes:		trinity-kdesdk < %{version}-%{release}
-Provides:		trinity-kdesdk = %{version}-%{release}
-Obsoletes:		trinity-kdesdk-libs < %{version}-%{release}
-Provides:		trinity-kdesdk-libs = %{version}-%{release}
-
-Requires: trinity-cervisia = %{version}-%{release}
-Requires: trinity-kapptemplate = %{version}-%{release}
-Requires: trinity-kbabel = %{version}-%{release}
-Requires: trinity-kbugbuster = %{version}-%{release}
-Requires: trinity-tdecachegrind = %{version}-%{release}
-Requires: trinity-tdecachegrind-converters = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-misc = %{version}-%{release}
-Requires: %{name}-scripts = %{version}-%{release}
-Requires: trinity-kmtrace = %{version}-%{release}
-Requires: trinity-kompare = %{version}-%{release}
-Requires: trinity-kspy = %{version}-%{release}
-Requires: trinity-kuiviewer = %{version}-%{release}
-Requires: trinity-libcvsservice0 = %{version}-%{release}
-Requires: trinity-poxml = %{version}-%{release}
-Requires: trinity-umbrello = %{version}-%{release}
-%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}}
-Requires: trinity-tdeunittest = %{version}-%{release}
+Obsoletes:		trinity-kdesdk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdesdk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdesdk-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdesdk-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-cervisia = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kapptemplate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbugbuster = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdecachegrind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdecachegrind-converters = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kuiviewer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-poxml = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-umbrello = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -384,7 +384,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %package -n trinity-kbabel-devel
 Summary:	PO-file editing suite for Trinity (development files)
 Group:		Development/Libraries/Other
-Requires:	trinity-kbabel = %{version}-%{release}
+Requires:	trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kbabel-devel
 This is a suite of programs for editing gettext message files (PO-files).
@@ -796,7 +796,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %package -n trinity-libcvsservice-devel
 Summary:	Development files for CVS DCOP service
 Group:		Development/Libraries/Other
-Requires:	trinity-libcvsservice0 = %{version}-%{release}
+Requires:	trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libcvsservice-devel
 The library libcvsservice provides a DCOP service for accessing and
@@ -885,8 +885,8 @@ Summary:	Subversion ioslave for Trinity
 Group:		Development/Languages/Other
 Requires:	subversion
 
-Obsoletes:	trinity-tdesdk-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdesdk-kio-plugins = %{version}-%{release}
+Obsoletes:	trinity-tdesdk-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdesdk-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package provides easy access to remote SVN repositories from within
@@ -949,8 +949,8 @@ fi
 Summary:	Unit testing library for Trinity
 Group:		Development/Languages/Other
 
-Obsoletes:	trinity-kunittest < %{version}-%{release}
-Provides:	trinity-kunittest = %{version}-%{release}
+Obsoletes:	trinity-kunittest < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kunittest = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdeunittest
 tdeunittest is a small library that facilitates the writing of tests for
@@ -976,17 +976,17 @@ This package is part of Trinity, and a component of the TDE SDK module.
 Summary:	Development files for %{name}
 Group:		Development/Libraries/Other
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-kbabel-devel = %{version}-%{release}
-Requires:	%{name}-misc = %{version}-%{release}
-Requires:	trinity-kspy = %{version}-%{release}
-Requires:	trinity-kmtrace = %{version}-%{release}
-Requires:	trinity-tdeunittest = %{version}-%{release}
-Requires:	trinity-libcvsservice-devel = %{version}-%{release}
-Requires:	trinity-kompare = %{version}-%{release}
-
-Obsoletes:	trinity-kdesdk-devel < %{version}-%{release}
-Provides:	trinity-kdesdk-devel = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kbabel-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libcvsservice-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdesdk-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesdk-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This package contains the development files for tdesdk.