bump epoch to 4

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2021-01-12 11:15:47 -05:00
parent 6c7182809c
commit 74debefad5
2 changed files with 13 additions and 8 deletions

View File

@ -1,8 +1,8 @@
# Bellow definitions are used to deliver config files from a particular branch # Below definitions are used to deliver config files from a particular branch
# of c/image, c/common, c/storage vendored in all podman, skopeo, buildah. # of c/image, c/common, c/storage vendored in all of Buildah, Podman and Skopeo.
# These vendored components must have the same version. If it is not the case, # These vendored components must have the same version. If it is not the case,
# pick the oldest version on c/image, c/common, c/storage vendored in # pick the oldest version on c/image, c/common, c/storage vendored in
# podman/skopeo/podman. # Buildah/Podman/Skopeo.
%global skopeo_branch master %global skopeo_branch master
%global podman_branch master %global podman_branch master
%global image_branch master %global image_branch master
@ -12,10 +12,15 @@
%global github_containers https://raw.githubusercontent.com/containers %global github_containers https://raw.githubusercontent.com/containers
Epoch: 3 # non-rawhide only
%define built_tag v0.33.0
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
%define download_url %{git0}/archive/%{built_tag}.tar.gz
Epoch: 4
Name: containers-common Name: containers-common
Version: 1 Version: 0.33.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
BuildArch: noarch BuildArch: noarch
@ -113,7 +118,7 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
* Tue Jan 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 3:1-2 * Tue Jan 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-1
- update registries.conf and other files - update registries.conf and other files
* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 3:1-1 * Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 3:1-1

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
spectool -f -g containers-common.spec spectool -fg containers-common.spec
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' storage.conf sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' storage.conf
[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \ [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
"keyctl",' seccomp.json "keyctl",' seccomp.json