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

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

1 files changed, 42 insertions, 42 deletions

diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 67947459a..0ef8f695a 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -266,32 +266,32 @@ BuildRequires:	speex-devel
 %define build_kopete_motionaway 1
 %endif
 
-Obsoletes:	trinity-kdenetwork < %{version}-%{release}
-Provides:	trinity-kdenetwork = %{version}-%{release}
-Obsoletes:	trinity-kdenetwork-libs < %{version}-%{release}
-Provides:	trinity-kdenetwork-libs = %{version}-%{release}
-Obsoletes:	trinity-kdenetwork-extras < %{version}-%{release}
-Provides:	trinity-kdenetwork-extras = %{version}-%{release}
-Obsoletes:	tdenetwork < %{version}-%{release}
-Provides:	tdenetwork = %{version}-%{release}
-
-Requires: trinity-dcoprss = %{version}-%{release}
-Requires: %{name}-filesharing = %{version}-%{release}
-Requires: trinity-kdict = %{version}-%{release}
-Requires: %{name}-tdefile-plugins = %{version}-%{release}
-Requires: trinity-kget = %{version}-%{release}
-Requires: trinity-knewsticker = %{version}-%{release}
-Requires: trinity-kopete = %{version}-%{release}
-Requires: trinity-kopete-nowlistening = %{version}-%{release}
-Requires: trinity-kpf = %{version}-%{release}
-Requires: trinity-kppp = %{version}-%{release}
-Requires: trinity-krdc = %{version}-%{release}
-Requires: trinity-krfb = %{version}-%{release}
-Requires: trinity-ksirc = %{version}-%{release}
-Requires: trinity-ktalkd = %{version}-%{release}
-Requires: trinity-kwifimanager = %{version}-%{release}
-Requires: trinity-librss = %{version}-%{release}
-Requires: trinity-lisa = %{version}-%{release}
+Obsoletes:	trinity-kdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdenetwork-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdenetwork-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-dcoprss = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kget = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knewsticker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kopete-nowlistening = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kppp = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 This metapackage includes a collection of network and networking related
@@ -346,17 +346,17 @@ DCOP is the TDE interprocess communication protocol.
 %package devel
 Summary:		Development files for the Trinity network module
 Group:			Development/Libraries/Other
-Requires:		%{name} = %{version}-%{release}
-Requires:		trinity-kdict = %{version}-%{release}
-Requires:		trinity-kopete = %{version}-%{release}
-Requires:		trinity-ksirc = %{version}-%{release}
-Requires:		trinity-librss = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-tdelibs-devel >= %{tde_version}
 
-Obsoletes:	trinity-kdenetwork-devel < %{version}-%{release}
-Provides:	trinity-kdenetwork-devel = %{version}-%{release}
-Obsoletes:	tdenetwork-devel < %{version}-%{release}
-Provides:	tdenetwork-devel = %{version}-%{release}
+Obsoletes:	trinity-kdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This is the development package which contains the headers for the TDE RSS
@@ -387,8 +387,8 @@ development-related files for the TDE network module.
 Summary:		Network filesharing configuration module for Trinity
 Group:   		Applications/Internet
 
-Obsoletes:		tdenetwork-filesharing < %{version}-%{release}
-Provides:		tdenetwork-filesharing = %{version}-%{release}
+Obsoletes:		tdenetwork-filesharing < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdenetwork-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description filesharing
 This package provides a Trinity Control Center module to configure
@@ -441,10 +441,10 @@ basic as well as advanced queries.
 Summary:		Torrent metainfo plugin for Trinity
 Group:			Applications/Internet
 
-Obsoletes:		tdenetwork-kfile-plugins < %{version}-%{release}
-Provides:		tdenetwork-kfile-plugins = %{version}-%{release}
-Obsoletes:		trinity-tdenetwork-kfile-plugins < %{version}-%{release}
-Provides:		trinity-tdenetwork-kfile-plugins = %{version}-%{release}
+Obsoletes:		tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdefile-plugins
 This package provides a metainformation plugin for bittorrent files.
@@ -730,7 +730,7 @@ Support for more IM protocols can be added through a plugin system.
 %package -n trinity-kopete-nowlistening
 Summary:		Nowlistening (xmms) plugin for Kopete
 Group:			Applications/Internet
-Requires:		trinity-kopete = %{version}-%{release}
+Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-filesystem >= %{tde_version}
 
 %description -n trinity-kopete-nowlistening