correct changelog tag
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
c996c1964d
commit
6cba1e5efe
@ -56,11 +56,7 @@ Version: 3.0.0
|
|||||||
# N.foo if released, 0.N.foo if unreleased
|
# N.foo if released, 0.N.foo if unreleased
|
||||||
# Rawhide almost always ships unreleased builds,
|
# Rawhide almost always ships unreleased builds,
|
||||||
# so release tag should be of the form 0.N.foo
|
# so release tag should be of the form 0.N.foo
|
||||||
<<<<<<< HEAD
|
Release: 0.19.dev.git%{shortcommit0}%{?dist}
|
||||||
Release: 0.18.dev.git%{shortcommit0}%{?dist}
|
|
||||||
=======
|
|
||||||
Release: 0.17.dev.git%{shortcommit0}%{?dist}
|
|
||||||
>>>>>>> be7c5c2 (podman-2:3.0.0-0.17.dev.git85b412d)
|
|
||||||
Summary: Manage Pods, Containers and Container Images
|
Summary: Manage Pods, Containers and Container Images
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://%{name}.io/
|
URL: https://%{name}.io/
|
||||||
@ -631,7 +627,7 @@ exit 0
|
|||||||
|
|
||||||
# rhcontainerbot account currently managed by lsm5
|
# rhcontainerbot account currently managed by lsm5
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Dec 3 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:3.0.0-0.17.dev.git85b412d
|
* Thu Dec 3 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:3.0.0-0.19.dev.git85b412d
|
||||||
- Harden binaries
|
- Harden binaries
|
||||||
- Reported-by: Wade Mealing <wmealing@gmail.com>
|
- Reported-by: Wade Mealing <wmealing@gmail.com>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user