From 9dd6fa2bfec9ca3ef582fd99adedba7ef5698d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Lepp=C3=A4nen?= Date: Wed, 9 Jan 2019 09:37:19 +0200 Subject: [PATCH] Conflict instead of obsolete in symlinks packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [packaging] Replace obsoletes in symlink-findutils. Contributes to JB#36243 [packaging] Replace obsoletes in symlink-grep. Contributes to JB#40843 [packaging] Replace obsoletes in symlink-diffutils. Contributes to JB#36423 Also provide /bin/grep in busybox-symlinks-grep for oneshot. --- rpm/busybox.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rpm/busybox.spec b/rpm/busybox.spec index 53c60ef..9271298 100644 --- a/rpm/busybox.spec +++ b/rpm/busybox.spec @@ -91,7 +91,7 @@ Requires: %{name} = %{version}-%{release} Group: System/Shells Summary: Busybox replacements for diffutils Provides: diffutils = %{version} -Obsoletes: diffutils <= 2.8.1 +Conflicts: gnu-diffutils %description symlinks-diffutils Busybox is a single binary which includes versions of a large number @@ -105,7 +105,7 @@ Requires: %{name} = %{version}-%{release} Group: System/Shells Summary: Busybox replacements for findutils Provides: findutils = %{version} -Obsoletes: findutils <= 4.2.31 +Conflicts: gnu-findutils %description symlinks-findutils Busybox is a single binary which includes versions of a large number @@ -119,7 +119,8 @@ Requires: %{name} = %{version}-%{release} Group: System/Shells Summary: Busybox replacements for grep Provides: grep = %{version} -Obsoletes: grep <= 2.5.1a +Provides: /bin/grep +Conflicts: gnu-grep %description symlinks-grep Busybox is a single binary which includes versions of a large number