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

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

1 files changed, 49 insertions, 49 deletions

diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
index 4902e47f6..8deae8f67 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -118,46 +118,46 @@ BuildRequires:	brp-check-trinity
 # GLIB2 support
 BuildRequires:	glib2-devel
 
-Obsoletes:		trinity-kdegames < %{version}-%{release}
-Provides:		trinity-kdegames = %{version}-%{release}
-Obsoletes:		trinity-kdegames-libs < %{version}-%{release}
-Provides:		trinity-kdegames-libs = %{version}-%{release}
-
-Requires: trinity-libtdegames1 = %{version}-%{release}
-Requires: trinity-tdegames-card-data = %{version}-%{release}
-Requires: trinity-atlantik = %{version}-%{release}
-Requires: trinity-kasteroids = %{version}-%{release}
-Requires: trinity-katomic = %{version}-%{release}
-Requires: trinity-kbackgammon = %{version}-%{release}
-Requires: trinity-kbattleship = %{version}-%{release}
-Requires: trinity-kblackbox = %{version}-%{release}
-Requires: trinity-kbounce = %{version}-%{release}
-Requires: trinity-kenolaba = %{version}-%{release}
-Requires: trinity-kfouleggs = %{version}-%{release}
-Requires: trinity-kgoldrunner = %{version}-%{release}
-Requires: trinity-kjumpingcube = %{version}-%{release}
-Requires: trinity-klickety = %{version}-%{release}
-Requires: trinity-klines = %{version}-%{release}
-Requires: trinity-kmahjongg = %{version}-%{release}
-Requires: trinity-kmines = %{version}-%{release}
-Requires: trinity-knetwalk = %{version}-%{release}
-Requires: trinity-kolf = %{version}-%{release}
-Requires: trinity-konquest = %{version}-%{release}
-Requires: trinity-kpat = %{version}-%{release}
-Requires: trinity-kpoker = %{version}-%{release}
-Requires: trinity-kreversi = %{version}-%{release}
-Requires: trinity-ksame = %{version}-%{release}
-Requires: trinity-kshisen = %{version}-%{release}
-Requires: trinity-ksirtet = %{version}-%{release}
-Requires: trinity-ksmiletris = %{version}-%{release}
-Requires: trinity-ksnake = %{version}-%{release}
-Requires: trinity-ksokoban = %{version}-%{release}
-Requires: trinity-kspaceduel = %{version}-%{release}
-Requires: trinity-ktron = %{version}-%{release}
-Requires: trinity-ktuberling = %{version}-%{release}
-Requires: trinity-twin4 = %{version}-%{release}
-Requires: trinity-lskat = %{version}-%{release}
-Requires: trinity-tdefifteen = %{version}-%{release}
+Obsoletes:		trinity-kdegames < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdegames-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdegames-card-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kasteroids = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-katomic = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbackgammon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbattleship = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kblackbox = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbounce = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kenolaba = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfouleggs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgoldrunner = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kjumpingcube = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klickety = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klines = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmahjongg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmines = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knetwalk = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konquest = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpoker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kreversi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksame = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kshisen = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksirtet = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksmiletris = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksnake = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksokoban = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kspaceduel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktron = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktuberling = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-twin4 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-lskat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdefifteen = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -174,14 +174,14 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
 Summary:	Development files for %{name} 
 Group:		Amusements/Games/Other
 
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	trinity-libtdegames-devel = %{version}-%{release}
-Requires:	trinity-atlantik-devel = %{version}-%{release}
-Requires:	trinity-kolf-devel = %{version}-%{release}
+Requires:	trinity-libtdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-atlantik-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kolf-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		trinity-kdegames-devel < %{version}-%{release}
-Provides:		trinity-kdegames-devel = %{version}-%{release}
+Obsoletes:		trinity-kdegames-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Install %{name}-devel if you wish to develop or compile games for the
@@ -220,7 +220,7 @@ This package is part of TDE, and a component of the TDE games module.
 %package -n trinity-libtdegames-devel
 Summary:	Trinity games library headers
 Group:		Development/Libraries/Other
-Requires:	trinity-libtdegames1 = %{version}-%{release}
+Requires:	trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdegames-devel
 This package is necessary if you want to develop your own games using
@@ -285,7 +285,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %package -n trinity-atlantik-devel
 Summary:	Development files for Atlantik
 Group:		Development/Libraries/Other
-Requires:	trinity-atlantik = %{version}-%{release}
+Requires:	trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-atlantik-devel
 This package contains header files for compiling programs against the
@@ -734,7 +734,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %package -n trinity-kolf-devel
 Summary:	Development files for Kolf
 Group:		Development/Libraries/Other
-Requires:	trinity-kolf = %{version}-%{release}
+Requires:	trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kolf-devel
 This package contains headers and development libraries for compiling