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

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

1 files changed, 62 insertions, 62 deletions

diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec
index 5bc1dfcc9..7423d0c91 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -140,41 +140,41 @@ BuildRequires: ocaml
 %define with_v4l 1
 %endif
 
-Obsoletes:		trinity-kdeedu < %{version}-%{release}
-Provides:		trinity-kdeedu = %{version}-%{release}
-Obsoletes:		trinity-kdeedu-libs < %{version}-%{release}
-Provides:		trinity-kdeedu-libs = %{version}-%{release}
+Obsoletes:		trinity-kdeedu < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeedu = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdeedu-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeedu-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Meta-package
-Requires: %{name}-data = %{version}-%{release}
-Requires: trinity-blinken = %{version}-%{release}
-Requires: trinity-kalzium = %{version}-%{release}
-Requires: trinity-kalzium-data = %{version}-%{release}
-Requires: trinity-kanagram = %{version}-%{release}
-Requires: trinity-kbruch = %{version}-%{release}
-Requires: trinity-keduca = %{version}-%{release}
-Requires: trinity-kgeography = %{version}-%{release}
-Requires: trinity-kgeography-data = %{version}-%{release}
-Requires: trinity-khangman = %{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-blinken = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kalzium = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kanagram = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbruch = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-keduca = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgeography = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khangman = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_kig}
-Requires: trinity-kig = %{version}-%{release}
+Requires: trinity-kig = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-Requires: trinity-kiten = %{version}-%{release}
-Requires: trinity-klatin = %{version}-%{release}
-Requires: trinity-klettres = %{version}-%{release}
-Requires: trinity-klettres-data = %{version}-%{release}
-Requires: trinity-kmplot = %{version}-%{release}
-Requires: trinity-kpercentage = %{version}-%{release}
-Requires: trinity-kstars = %{version}-%{release}
-Requires: trinity-kstars-data = %{version}-%{release}
-Requires: trinity-ktouch = %{version}-%{release}
-Requires: trinity-kturtle = %{version}-%{release}
-Requires: trinity-kverbos = %{version}-%{release}
-Requires: trinity-kvoctrain = %{version}-%{release}
-Requires: trinity-kwordquiz = %{version}-%{release}
-Requires: trinity-libtdeedu3 = %{version}-%{release}
-Requires: trinity-libkiten1 = %{version}-%{release}
-Requires: trinity-indi = %{version}-%{release}
+Requires: trinity-kiten = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klatin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klettres = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmplot = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpercentage = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kstars = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktouch = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kturtle = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kverbos = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kvoctrain = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kwordquiz = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -231,7 +231,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-blinken
 Summary:	Trinity version of the Simon Says electronic memory game
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-blinken
 Blinken is based on an electronic game released in 1978, which
@@ -261,8 +261,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kalzium
 Summary:	Chemistry teaching tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-kalzium-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kalzium
 Kalzium is a program which shows you the Periodic System of Elements
@@ -318,7 +318,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kanagram
 Summary:	Letter order game for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kanagram
 KAnagram is a game that is based on the word/letter puzzles that the
@@ -351,7 +351,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kbruch
 Summary:	Fraction calculation teaching tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kbruch
 KBruch is a small program to practice calculating with fractions.
@@ -377,7 +377,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-keduca
 Summary:	Interactive form-based tests for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-keduca
 KEduca is a flash-card application which allows you to make
@@ -408,8 +408,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kgeography
 Summary:	Geography learning tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-kgeography-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kgeography
 KGeography contains maps allowing you to learn various countries or
@@ -456,7 +456,7 @@ This package is part of Trinity, as a component of the TDE education module.
 Summary:	The classical hangman game for Trinity
 Group:		System/GUI/Other
 #Requires:	dustin-dustismo-sans-fonts
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-khangman
 KHangMan is a game based on the well known hangman game.  It is aimed
@@ -488,7 +488,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kig
 Summary:	Interactive geometry program for TDE
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kig
 Kig is an application for interactive geometry.  It is intended to
@@ -550,7 +550,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kiten
 Summary:	Japanese reference/study tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 #Requires:	ttf-kochi-gothic | ttf-kochi-mincho
 
 %description -n trinity-kiten
@@ -577,7 +577,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-klatin
 Summary:	Application to help revise/teach Latin
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-klatin
 KLatin is a program to help revise Latin.  There are three "sections"
@@ -612,8 +612,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-klettres
 Summary:	Foreign alphabet tutor for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-klettres-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-klettres
 KLettres is an application specially designed to help the user to
@@ -661,7 +661,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kmplot
 Summary:	Mathematical function plotter for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kmplot
 KmPlot is a mathematical function plotter for TDE.  It has a powerful
@@ -699,7 +699,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kpercentage
 Summary:	Percentage calculation teaching tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kpercentage
 KPercentage is a small math application that will help pupils to
@@ -726,9 +726,9 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kstars
 Summary:	Desktop planetarium for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-Requires:	trinity-kstars-data = %{version}-%{release}
-Requires:	trinity-indi = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kstars
 KStars is a graphical desktop planetarium for TDE.  It depicts an
@@ -780,7 +780,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-ktouch
 Summary:	Touch typing tutor for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ktouch
 KTouch is a program for learning touch typing - it helps you learn to
@@ -810,7 +810,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kturtle
 Summary:	Educational Logo programming environment
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kturtle
 KTurtle is an educational programming environment using the Logo
@@ -848,7 +848,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kverbos
 Summary:	Spanish verb form study application for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kverbos
 Kverbos allows the user to learn the forms of Spanish verbs.  The
@@ -880,7 +880,7 @@ Summary:	Vocabulary trainer for Trinity
 Group:		System/GUI/Other
 Requires:	perl
 Requires:	perl-libwww-perl
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kvoctrain
 KVocTrain is a little utility to help you train your vocabulary when
@@ -922,7 +922,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kwordquiz
 Summary:	Flashcard and vocabulary learning program for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kwordquiz
 KWordQuiz is a flashcard-based tool that helps you to master new
@@ -976,7 +976,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-libtdeedu-devel
 Summary:	Development files for Trinity educational library
 Group:		Development/Libraries/Other
-Requires:	trinity-libtdeedu3 = %{version}-%{release}
+Requires:	trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdeedu-devel
 The TDE-based library libtdeedu is used with educational
@@ -1035,7 +1035,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-libkiten-devel
 Summary:	Development files for Kiten library
 Group:		Development/Libraries/Other
-Requires:	trinity-libkiten1 = %{version}-%{release}
+Requires:	trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
 
 %description -n trinity-libkiten-devel
@@ -1105,12 +1105,12 @@ This package is part of Trinity, as a component of the TDE education module.
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-libtdeedu-devel = %{version}-%{release}
-Requires:	trinity-libkiten-devel = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkiten-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-kdeedu-devel < %{version}-%{release}
-Provides:	trinity-kdeedu-devel = %{version}-%{release}
+Obsoletes:	trinity-kdeedu-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This package contains the development files for tdeedu.