From ec1c5eaa0e86bf9f34c15e86675834683fbcbbfb 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/dependencies/arts/arts.spec | 4 ++-- redhat/dependencies/libart-lgpl/libart-lgpl.spec | 10 +++++----- redhat/dependencies/libcarddav/libcarddav.spec | 4 ++-- redhat/dependencies/python-tqt/python-tqt.spec | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'redhat/dependencies') diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 5642d945a..062fb1415 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -129,7 +129,7 @@ Requires: libtqt4 >= %{tde_epoch}:4.2.0 Requires: audiofile %if "%{?tde_prefix}" == "/usr" -Obsoletes: arts +Obsoletes: arts < %{?epoch:%{epoch}:}%{version}-%{release} %endif %description @@ -170,7 +170,7 @@ Group: Development/Libraries Summary: ARTS (analog realtime synthesizer) - the TDE sound system (Development files) Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{?tde_prefix}" == "/usr" -Obsoletes: arts-devel +Obsoletes: arts-devel < %{?epoch:%{epoch}:}%{version}-%{release} %endif Requires: alsa-lib-devel diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index c1423577a..924074c91 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -68,11 +68,11 @@ especially suitable for embedded applications. %package -n %{libart}_lgpl_2-2 Summary: Library of functions for 2D graphics - runtime files Group: System/Libraries -Obsoletes: libart_lgpl < %{version}-%{release} -Provides: libart_lgpl = %{version}-%{release} -Obsoletes: %{_lib}art_lgpl2 < %{version}-%{release} -Provides: %{_lib}art_lgpl2 = %{version}-%{release} -Provides: libart_lgpl_2-2 = %{version}-%{release} +Obsoletes: libart_lgpl < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libart_lgpl = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{_lib}art_lgpl2 < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{_lib}art_lgpl2 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libart_lgpl_2-2 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{libart}_lgpl_2-2 A library of functions for 2D graphics supporting a superset of the diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index ec6fc38e1..9a58cc122 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -118,8 +118,8 @@ Requires: %{libcarddav}0 = %{?epoch:%{epoch}:}%{version}-%{release} %{?libcurl_devel:Requires: %{libcurl_devel}} Requires: glib2-devel -Obsoletes: trinity-libcarddav-devel < %{version}-%{release} -Provides: trinity-libcarddav-devel = %{version}-%{release} +Obsoletes: trinity-libcarddav-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{libcarddav}-devel diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/python-tqt/python-tqt.spec index 001d64264..5d8aa43d0 100644 --- a/redhat/dependencies/python-tqt/python-tqt.spec +++ b/redhat/dependencies/python-tqt/python-tqt.spec @@ -59,8 +59,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Obsoletes: trinity-PyQt -Obsoletes: trinity-python-qt3 +Obsoletes: trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: tqt3-apps-devel >= 3.5.0 BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 -- cgit v1.2.1