From 8e3510f75a34c04dcf4503c15d4cfa85c92ed0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 13 May 2021 20:36:43 +0200 Subject: RPM: update all 'Obsoletes' and 'Provides' statement to avoid build warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/main/tdeutils/tdeutils.spec | 80 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'redhat/main/tdeutils/tdeutils.spec') diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec index 4ef2a2b1d..2afe14451 100644 --- a/redhat/main/tdeutils/tdeutils.spec +++ b/redhat/main/tdeutils/tdeutils.spec @@ -63,12 +63,12 @@ Source2: klaptop_acpi_helper.console Source3: kcmlaptoprc Source4: %{name}-rpmlintrc -Obsoletes: trinity-kdeutils < %{version}-%{release} -Provides: trinity-kdeutils = %{version}-%{release} -Obsoletes: trinity-kdeutils-extras < %{version}-%{release} -Provides: trinity-kdeutils-extras = %{version}-%{release} -Obsoletes: tdeutils < %{version}-%{release} -Provides: tdeutils = %{version}-%{release} +Obsoletes: trinity-kdeutils < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeutils = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdeutils-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeutils-extras = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdeutils < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdeutils = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -175,27 +175,27 @@ BuildRequires: openssl-devel %define build_tdefilereplace 1 %endif -Requires: trinity-ark = %{version}-%{release} -Requires: trinity-kcalc = %{version}-%{release} -Requires: trinity-kcharselect = %{version}-%{release} -Requires: trinity-tdelirc = %{version}-%{release} -Requires: trinity-tdessh = %{version}-%{release} -Requires: trinity-kdf = %{version}-%{release} -Requires: trinity-kedit = %{version}-%{release} -Requires: trinity-kfloppy = %{version}-%{release} -Requires: trinity-kgpg = %{version}-%{release} -Requires: trinity-khexedit = %{version}-%{release} -Requires: trinity-kjots = %{version}-%{release} -%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{version}-%{release}} -Requires: trinity-kmilo = %{version}-%{release} -Requires: trinity-kmilo-legacy = %{version}-%{release} -Requires: trinity-kregexpeditor = %{version}-%{release} -Requires: trinity-ksim = %{version}-%{release} -Requires: trinity-ktimer = %{version}-%{release} -Requires: trinity-tdewalletmanager = %{version}-%{release} -Requires: trinity-superkaramba = %{version}-%{release} +Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcharselect = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdelirc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdessh = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdf = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kedit = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kfloppy = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kgpg = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-khexedit = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kjots = %{?epoch:%{epoch}:}%{version}-%{release} +%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmilo-legacy = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?build_tdefilereplace} -Requires: trinity-tdefilereplace = %{version}-%{release} +Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release} %endif %description @@ -324,8 +324,8 @@ Summary: Infrared control for Trinity Group: Applications/Utilities Requires: trinity-filesystem -Obsoletes: trinity-kdelirc < %{version}-%{release} -Provides: trinity-kdelirc = %{version}-%{release} +Obsoletes: trinity-kdelirc < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdelirc = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdelirc This is a frontend for the LIRC suite to use infrared devices with TDE. @@ -369,8 +369,8 @@ Requires: openssh Requires: openssh-clients %endif -Obsoletes: trinity-kdessh < %{version}-%{release} -Provides: trinity-kdessh = %{version}-%{release} +Obsoletes: trinity-kdessh < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdessh = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdessh This package contains TDE's frontend for ssh. @@ -620,7 +620,7 @@ with special keys. %package -n trinity-kmilo-legacy Summary: Non-standard plugins for KMilo Group: Applications/Utilities -Requires: trinity-kmilo = %{version}-%{release} +Requires: trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kcontrol %description -n trinity-kmilo-legacy @@ -725,8 +725,8 @@ command execution. Summary: Wallet manager for Trinity Group: Applications/Utilities -Obsoletes: trinity-kwalletmanager < %{version}-%{release} -Provides: trinity-kwalletmanager = %{version}-%{release} +Obsoletes: trinity-kwalletmanager < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kwalletmanager = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdewalletmanager This program keeps various wallets for any kind of data that the user can @@ -785,8 +785,8 @@ Here are just some examples of the things that can be done: Summary: Batch search-and-replace component for TDE Group: Applications/Utilities -Obsoletes: trinity-kfilereplace < %{version}-%{release} -Provides: trinity-kfilereplace = %{version}-%{release} +Obsoletes: trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdefilereplace TDEFileReplace is an embedded component for TDE that acts as a batch @@ -818,13 +818,13 @@ This package is part of Trinity, as a component of the TDE utilities module. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel -Obsoletes: trinity-kdeutils-devel < %{version}-%{release} -Provides: trinity-kdeutils-devel = %{version}-%{release} -Obsoletes: tdeutils-devel < %{version}-%{release} -Provides: tdeutils-devel = %{version}-%{release} +Obsoletes: trinity-kdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the development files for tdeutils. -- cgit v1.2.1