Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Conflict instead of obsolete in symlinks packages
[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.
  • Loading branch information
Tomin1 committed Jan 10, 2019
1 parent 0f1e532 commit 9dd6fa2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions rpm/busybox.spec
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 9dd6fa2

Please sign in to comment.