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

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

1 files changed, 36 insertions, 36 deletions

diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/main/tdemultimedia/tdemultimedia.spec
index 52d658d92..309f71a20 100644
--- a/redhat/main/tdemultimedia/tdemultimedia.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia.spec
@@ -59,14 +59,14 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	%{name}-rpmlintrc
 
-Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
-Provides:	trinity-kdemultimedia = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-libs = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -224,24 +224,24 @@ BuildRequires:		lame-devel
 %endif
 
 
-Requires: trinity-artsbuilder = %{version}-%{release}
-Requires: trinity-juk = %{version}-%{release}
-Requires: trinity-kaboodle = %{version}-%{release}
-Requires: trinity-kaudiocreator = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-kappfinder-data = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-tdemid = %{version}-%{release}
-Requires: trinity-kmix = %{version}-%{release}
-Requires: trinity-krec = %{version}-%{release}
-Requires: trinity-kscd = %{version}-%{release}
-%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}}
-Requires: trinity-libarts-audiofile = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
-%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
-Requires: trinity-libkcddb = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
-Requires: trinity-noatun = %{version}-%{release}
+Requires: trinity-artsbuilder = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-juk = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaboodle = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaudiocreator = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kappfinder-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdemid = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmix = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krec = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kscd = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_akode:Requires: trinity-libarts-akode = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?with_xine:Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-libkcddb = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_mpeg:Requires: trinity-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-noatun = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -467,7 +467,7 @@ Summary:	Light, embedded media player for Trinity
 Group:		System/GUI/Other
 
 %if 0%{?with_xine}
-Requires:	trinity-libarts-xine = %{version}-%{release}
+Requires:	trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description -n trinity-kaboodle
@@ -492,7 +492,7 @@ for TDE. It uses the aRts framework for playing media files.
 Summary:	CD ripper and audio encoder frontend for Trinity
 Group:		Productivity/Multimedia/CD/Grabbers
 
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	vorbis-tools
 Requires:	flac
 
@@ -586,8 +586,8 @@ Summary:	Enables the browsing of audio CDs under Konqueror
 Group:		Productivity/Multimedia/Sound/Utilities
 Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
 
-Obsoletes:	trinity-tdemultimedia-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdemultimedia-kio-plugins = %{version}-%{release}
+Obsoletes:	trinity-tdemultimedia-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdemultimedia-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package allow audio CDs to be browsed like a file system using
@@ -623,8 +623,8 @@ Konqueror and the audiocd:/ URL.
 Summary:	MIDI/karaoke player for Trinity
 Group:		Productivity/Multimedia/Sound/Midi
 
-Obsoletes:	trinity-kmid < %{version}-%{release}
-Provides:	trinity-kmid = %{version}-%{release}
+Obsoletes:	trinity-kmid < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kmid = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdemid
 This package provides a MIDI and karaoke player for TDE.
@@ -862,7 +862,7 @@ databases, for TDE applications.
 Summary:	MP3 and MPEG-1 audio and video library
 Group:		Productivity/Multimedia/Other
 %if 0%{?with_mpeg}
-Requires:	trinity-libarts-mpeglib = %{version}-%{release}
+Requires:	trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description -n trinity-mpeglib
@@ -974,11 +974,11 @@ formats supported by your installation of aRts (including aRts plugins).
 %package devel
 Summary:	Development files for %{name}, aRts and noatun plugins
 Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
-Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
-Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 {summary}.