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

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

1 files changed, 47 insertions, 47 deletions

diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec
index c8973fe5d..0ba833bac 100644
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ b/redhat/main/tdegraphics/tdegraphics.spec
@@ -237,39 +237,39 @@ BuildRequires:	openssl-devel
 %if 0%{?build_kmrml}
 #Requires:		gift
 %else
-Obsoletes:		trinity-kmrml < %{version}-%{release}
+Obsoletes:		trinity-kmrml < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
-Obsoletes:	trinity-kdegraphics < %{version}-%{release}
-Provides:	trinity-kdegraphics = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-libs < %{version}-%{release}
-Provides:	trinity-kdegraphics-libs = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-extras < %{version}-%{release}
-Provides:	trinity-kdegraphics-extras = %{version}-%{release}
-
-
-%{?build_kamera:Requires: trinity-kamera = %{version}-%{release}}
-Requires: trinity-kcoloredit = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-kdvi = %{version}-%{release}
-Requires: trinity-kfax = %{version}-%{release}
-Requires: trinity-kfaxview = %{version}-%{release}
-Requires: trinity-kgamma = %{version}-%{release}
-Requires: trinity-kghostview = %{version}-%{release}
-Requires: trinity-kiconedit = %{version}-%{release}
-%{?build_kmrml:Requires: trinity-kmrml = %{version}-%{release}}
-Requires: trinity-kolourpaint = %{version}-%{release}
-Requires: trinity-kooka = %{version}-%{release}
-Requires: trinity-kpdf = %{version}-%{release}
-Requires: trinity-kpovmodeler = %{version}-%{release}
-Requires: trinity-kruler = %{version}-%{release}
-Requires: trinity-ksnapshot = %{version}-%{release}
-Requires: trinity-ksvg = %{version}-%{release}
-Requires: trinity-kview = %{version}-%{release}
-Requires: trinity-kviewshell = %{version}-%{release}
-Requires: trinity-libkscan = %{version}-%{release}
+Obsoletes:	trinity-kdegraphics < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdegraphics-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdegraphics-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%{?build_kamera:Requires: trinity-kamera = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kcoloredit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdvi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfax = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfaxview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgamma = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kghostview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kmrml:Requires: trinity-kmrml = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kolourpaint = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kooka = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpdf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpovmodeler = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kruler = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksnapshot = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksvg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kviewshell = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_pdf}
-Requires: trinity-libpoppler-tqt = %{version}-%{release}
+Requires: trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description
@@ -540,8 +540,8 @@ online.
 Summary:	An icon editor for Trinity
 Group:		Productivity/Graphics/Viewers
 
-Obsoletes:	trinity-kiconedit < %{version}-%{release}
-Provides:	trinity-kiconedit = %{version}-%{release}
+Obsoletes:	trinity-kiconedit < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdeiconedit
 TDEIconedit allows you easily to create and edit icons.
@@ -894,7 +894,7 @@ It provides an easy-to-use library, which allows you to access your scanner
 %package -n trinity-libkscan-devel
 Summary:	Development files for the Trinity scanner library
 Group:		Development/Libraries/Other
-Requires:	trinity-libkscan = %{version}-%{release}
+Requires:	trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkscan-devel
 This package contains development files for Trinity's scanner library.
@@ -910,10 +910,10 @@ This package contains development files for Trinity's scanner library.
 %package -n trinity-libpoppler-tqt
 Summary:	TQt support for Poppler
 Group:		Productivity/Graphics/Viewers
-Obsoletes:	poppler-tqt < %{version}-%{release}
-Provides:	poppler-tqt = %{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt < %{version}-%{release}
-Provides:	%{name}-libpoppler-tqt = %{version}-%{release}
+Obsoletes:	poppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	poppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	%{name}-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libpoppler-tqt
 TQt support library for Poppler.
@@ -930,11 +930,11 @@ This library is used by the Trinity graphics file plugins for PDF support.
 %package -n trinity-libpoppler-tqt-devel
 Summary:	Development files for TQt support for Poppler
 Group:		Development/Libraries/Other
-Requires:	trinity-libpoppler-tqt = %{version}-%{release}
-Obsoletes:	poppler-tqt-devel < %{version}-%{release}
-Provides:	poppler-tqt-devel = %{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt-devel < %{version}-%{release}
-Provides:	%{name}-libpoppler-tqt-devel = %{version}-%{release}
+Requires:	trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	poppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	poppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	%{name}-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libpoppler-tqt-devel
 Development files of TQt support library for Poppler.
@@ -956,13 +956,13 @@ This package contains the development files needed to compile applications again
 Summary:	Development files for tdegraphics
 Group:		Development/Libraries/Other
 
-Obsoletes:	trinity-kdegraphics-devel < %{version}-%{release}
-Provides:	trinity-kdegraphics-devel = %{version}-%{release}
+Obsoletes:	trinity-kdegraphics-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-libkscan-devel = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkscan-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_pdf}
-Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
+Requires: trinity-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description devel