Skip to content

Commit

Permalink
Merge branch 'jb49333' into 'master'
Browse files Browse the repository at this point in the history
Provide proper versions.

See merge request mer-core/busybox!28
  • Loading branch information
Matti Kosola committed Sep 24, 2020
2 parents 800a6dc + c8102b3 commit 42b5b05
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions rpm/busybox.spec
Expand Up @@ -99,27 +99,30 @@ Summary: Busybox dhcp utilities
%package symlinks-diffutils
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for diffutils
Provides: diffutils
Conflicts: gnu-diffutils
Provides: diffutils = 2.8.1+git1
Obsoletes: diffutils < 2.8.1+git1

%description symlinks-diffutils
%{summary} as symlinks.

%package symlinks-findutils
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for findutils
Provides: findutils
Conflicts: gnu-findutils
Provides: findutils = 4.6.0+git2
Obsoletes: findutils < 4.6.0+git2

%description symlinks-findutils
%{summary} as symlinks.

%package symlinks-grep
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacement for grep
Provides: grep
Provides: /bin/grep
Conflicts: gnu-grep
Provides: grep = 1:2.5.1a+git1
Provides: /bin/grep
Obsoletes: grep < 1:2.5.1a+git1

%description symlinks-grep
%{summary} as symlinks (grep, egrep, fgrep).
Expand All @@ -146,8 +149,9 @@ Conflicts: procps-ng
%package symlinks-tar
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacement for tar
Provides: tar
Conflicts: gnu-tar
Provides: tar = 1.32+git2
Obsoletes: tar < 1.32+git2

%description symlinks-tar
%{summary} as symlinks.
Expand Down

0 comments on commit 42b5b05

Please sign in to comment.