Commit 2ddf2a92 authored by Tomi Leppänen's avatar Tomi Leppänen

Merge branch 'jb36243_jb36423_jb40843' into 'master'

Conflict instead of obsolete in symlinks packages

See merge request mer-core/busybox!7
parents 0f1e5326 9dd6fa2b
...@@ -91,7 +91,7 @@ Requires: %{name} = %{version}-%{release} ...@@ -91,7 +91,7 @@ Requires: %{name} = %{version}-%{release}
Group: System/Shells Group: System/Shells
Summary: Busybox replacements for diffutils Summary: Busybox replacements for diffutils
Provides: diffutils = %{version} Provides: diffutils = %{version}
Obsoletes: diffutils <= 2.8.1 Conflicts: gnu-diffutils
%description symlinks-diffutils %description symlinks-diffutils
Busybox is a single binary which includes versions of a large number Busybox is a single binary which includes versions of a large number
...@@ -105,7 +105,7 @@ Requires: %{name} = %{version}-%{release} ...@@ -105,7 +105,7 @@ Requires: %{name} = %{version}-%{release}
Group: System/Shells Group: System/Shells
Summary: Busybox replacements for findutils Summary: Busybox replacements for findutils
Provides: findutils = %{version} Provides: findutils = %{version}
Obsoletes: findutils <= 4.2.31 Conflicts: gnu-findutils
%description symlinks-findutils %description symlinks-findutils
Busybox is a single binary which includes versions of a large number Busybox is a single binary which includes versions of a large number
...@@ -119,7 +119,8 @@ Requires: %{name} = %{version}-%{release} ...@@ -119,7 +119,8 @@ Requires: %{name} = %{version}-%{release}
Group: System/Shells Group: System/Shells
Summary: Busybox replacements for grep Summary: Busybox replacements for grep
Provides: grep = %{version} Provides: grep = %{version}
Obsoletes: grep <= 2.5.1a Provides: /bin/grep
Conflicts: gnu-grep
%description symlinks-grep %description symlinks-grep
Busybox is a single binary which includes versions of a large number Busybox is a single binary which includes versions of a large number
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment