bump release for centos7

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Revert "podman-2:3.0.0-0.1.rc1"
2021-01-18 11:39:21 -05:00 · 2021-01-18 11:28:06 -05:00 · 2021-01-18 16:03:17 +00:00 · 2021-01-11 14:38:38 -05:00 · 2020-12-08 14:33:13 +00:00 · 2020-12-07 10:32:33 -05:00
4 changed files with 421 additions and 100 deletions
--- a/.gitignore
+++ b/.gitignore
@ -787,3 +787,42 @@
 /libpod-4699d5e.tar.gz
 /libpod-c4f6d56.tar.gz
 /libpod-5092c07.tar.gz
+/v1.8.0.tar.gz
+/v1.8.1-rc1.tar.gz
+/v1.8.1-rc2.tar.gz
+/v1.8.1-rc3.tar.gz
+/v1.8.1-rc4.tar.gz
+/v1.8.1.tar.gz
+/v1.8.2-rc1.tar.gz
+/v1.8.2.tar.gz
+/v1.9.0-rc1.tar.gz
+/v1.9.0-rc2.tar.gz
+/v1.9.0.tar.gz
+/v1.9.1.tar.gz
+/libpod-5b4e91d.tar.gz
+/v1.9.2.tar.gz
+/v1.9.3.tar.gz
+/v2.0.0-rc4.tar.gz
+/v2.0.0-rc5.tar.gz
+/v2.0.0-rc6.tar.gz
+/v2.0.0-rc7.tar.gz
+/v2.0.0.tar.gz
+/libpod-6bc5dcc.tar.gz
+/v2.0.1.tar.gz
+/v2.0.2.tar.gz
+/v2.0.3.tar.gz
+/v2.0.4.tar.gz
+/v2.0.5.tar.gz
+/v2.0.6-rc1.tar.gz
+/v2.0.6.tar.gz
+/v2.1.0-rc1.tar.gz
+/v2.1.0-rc2.tar.gz
+/v2.1.0.tar.gz
+/v2.1.1.tar.gz
+/dnsname-a9c2a10.tar.gz
+/podman-286d356.tar.gz
+/v2.2.0-rc1.tar.gz
+/v2.2.0-rc2.tar.gz
+/v2.2.0.tar.gz
+/dnsname-c654c95.tar.gz
+/v2.2.1.tar.gz
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
  - fedora-*
-decision_context: bodhi_update_push_stable
+decision_context: bodhi_update_push_testing
 rules:
-  - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- a/podman.spec
+++ b/podman.spec
@ -6,9 +6,13 @@
 %if 0%{?fedora} || 0%{?centos} >= 8
 #### DO NOT REMOVE - NEEDED FOR CENTOS
 %bcond_without varlink
-%global with_debug 1
 %else
 %bcond_with varlink
+%endif
+
+%if 0%{?fedora}
+%global with_debug 1
+%else
 %global with_debug 0
 %endif

@ -24,27 +28,26 @@
 %endif
 %define gogenerate go generate

-%global provider github
-%global provider_tld com
-%global project containers
-%global repo libpod
-# https://github.com/containers/libpod
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 5092c078ec635c9f1598989b27ccf53369b3cf2b
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%define provider github
+%define provider_tld com
+%define project containers
+%define repo %{name}
+# https://github.com/containers/podman
+%define import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%define git0 https://%{import_path}

 %global repo_plugins dnsname
 # https://github.com/containers/libpod
 %global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins}
 %global git_plugins https://%{import_path_plugins}
-%global commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe
+%global commit_plugins c654c95366ac5f309ca3e5727c9b858864247328
 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7})

 # Used for comparing with latest upstream tag
 # to decide whether to autobuild (non-rawhide only)
-%define built_tag v1.8.0-rc1
+%define built_tag v2.2.1
+%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
+%define download_url %{git0}/archive/%{built_tag}.tar.gz

 Name: podman
 %if 0%{?fedora}
@ -52,15 +55,21 @@ Epoch: 2
 %else
 Epoch: 0
 %endif
-Version: 1.8.0
+Version: 2.2.1
+# RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER
+# N.foo if released, 0.N.foo if unreleased
 # Rawhide almost always ships unreleased builds,
-# so release tag should be of the form 0.N.blahblah
-Release: 0.4.dev.git%{shortcommit0}%{?dist}
+# so release tag should be of the form 0.N.foo
+Release: 2%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://%{name}.io/
-Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
-Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz
+Source0: %{download_url}
+# To build a random user's fork/commit, comment out above line,
+# uncomment below Source0, and replace the placeholders with the right info
+# Also, adjust %%prep section as necessary.
+#Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz
+Source1: https://github.com/containers/dnsname/archive/c654c95366ac5f309ca3e5727c9b858864247328/dnsname-c654c95.tar.gz
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
@ -68,7 +77,7 @@ BuildRequires: golang
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
-BuildRequires: git
+BuildRequires: git-core
 BuildRequires: go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
@ -79,25 +88,33 @@ BuildRequires: pkgconfig
 BuildRequires: make
 BuildRequires: systemd
 BuildRequires: systemd-devel
-Requires: containers-common
-Requires: containernetworking-plugins >= 0.7.5-1
+Requires: containernetworking-plugins >= 0.8.6-1
 Requires: iptables
 Requires: nftables
-Requires: conmon
-Requires: %{name}-plugins = %{epoch}:%{version}-%{release}
-Requires:  (container-selinux if selinux-policy)
+Requires: conmon >= 2:2.0.18-1
+Obsoletes: oci-systemd-hook <= 0.2.0-3
 %if 0%{?fedora}
 BuildRequires: btrfs-progs-devel
 BuildRequires: ostree-devel
-Recommends: libvarlink-util
-Recommends: slirp4netns >= 0.3.0-2
+Requires: containers-common >= 1:1.2.0-9
 Recommends: fuse-overlayfs >= 0.3-8
-Recommends: runc
-Requires: crun >= 0.12.1-1
+Recommends: crun >= 0.15-5
 %else
-#### DO NOT REMOVE - NEEDED FOR CENTOS
-Requires: slirp4netns >= 0.3.0-2
+Requires: containers-common >= 2:1.2.0-9
+%endif
+%if 0%{?fedora} || 0%{?centos} >= 8
+Recommends: %{name}-plugins = %{epoch}:%{version}-%{release}
+Recommends: catatonit
+Requires: (container-selinux if selinux-policy)
+Recommends: runc
+Recommends: slirp4netns >= 0.3.0-2
+Recommends: libvarlink-util
+%else
+Requires: %{name}-plugins = %{epoch}:%{version}-%{release}
+Requires: catatonit
+Requires: container-selinux
 Requires: runc
+Requires: slirp4netns >= 0.3.0-2
 %endif

 # vendored libraries
@ -215,7 +232,7 @@ Both tools share image (not container) storage, hence each can use or
 manipulate images (but not containers) created by the other.

 %{summary}
-%{repo} Simple management tool for pods, containers and images
+%{name} is a simple management tool for pods, containers and images

 %package docker
 Summary: Emulate Docker CLI using %{name}
@ -386,27 +403,32 @@ Requires: golang(github.com/urfave/cli)

 %description unit-test-devel
 %{summary}
-%{repo} provides a library for applications looking to use the
+%{name} provides a library for applications looking to use the
 Container Pod concept popularized by Kubernetes.

 This package contains unit tests for project
 providing packages with %{import_path} prefix.
 %endif

-%if 0%{?fedora}
 %package tests
 Summary: Tests for %{name}

 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: bats
 Requires: jq
-Obsoletes: oci-systemd-hook <= 0.2.0-3
+Requires: skopeo
+Requires: nmap-ncat
+Requires: httpd-tools
+Requires: openssl
+Requires: socat
+Requires: buildah

 %description tests
 %{summary}

 This package contains system tests for %{name}

+%if 0%{?fedora} || 0%{?centos} >= 8
 %package remote
 Summary: (Experimental) Remote client for managing %{name} containers

@ -423,6 +445,8 @@ connections as well.

 %package plugins
 Summary: Plugins for %{name}
+Requires: dnsmasq
+Requires: %{name} = %{epoch}:%{version}-%{release}

 %description plugins
 This plugin sets up the use of dnsmasq on a given CNI network so
@ -433,40 +457,30 @@ is removed from the network, it will remove the entry from the hosts
 file.  Each CNI network will have its own dnsmasq instance.

 %prep
-%autosetup -Sgit -n %{repo}-%{commit0}
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
+# If you have replaced Source0 for building a random commit, uncomment
+# comment out the autosetup line above and uncomment below autosetup line
+# Use appropriate value for $BRANCH as in Source0
+#%%autosetup -Sgit -n %%{name}-$BRANCH 
+
+rm -f docs/source/markdown/containers-mounts.conf.5.md

 # untar dnsname
 tar zxf %{SOURCE1}

 %build
 export GO111MODULE=off
-export GOPATH=$(pwd)/_build:$(pwd)
-
-mkdir _build
-pushd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s ../../../../ src/%{import_path}
-popd
-ln -s vendor src
-%gogenerate ./cmd/%{name}/varlink/...
-
-# build %%{name}
-export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
-%if 0%{?centos}
-export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub"
+export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+%ifarch x86_64
+export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic"
+%if 0%{?fedora} || 0%{?centos} >= 8
+export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection"
 %endif
-%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
-
-%if 0%{?fedora}
-#### DO NOT REMOVE - NEEDED FOR CENTOS
-# build %%{name}-remote
-export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
-%if 0%{?centos}
-export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub"
 %endif
-%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
-%endif 
+# These extra flags present in %%{optflags} have been skipped for now as they break the build   
+#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1"

+# build plugins first cause we don't wanna use podman's buildtags
 pushd dnsname-%{commit_plugins}
 mkdir _build
 pushd _build
@ -478,32 +492,58 @@ export GOPATH=$(pwd)/_build:$(pwd)
 %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname
 popd

-%install
-%if 0%{?fedora}
-sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf  -i
-%endif
-sed -i 's/install.remote: podman-remote/install.remote:/' Makefile
-sed -i 's/install.bin: podman/install.bin:/' Makefile
-rm -rf docs/containers-mounts.conf.5.md
+export GOPATH=$(pwd)/_build:$(pwd)
+mkdir _build
+pushd _build
+mkdir -p src/%{provider}.%{provider_tld}/%{project}
+ln -s ../../../../ src/%{import_path}
+popd
+ln -s vendor src

-install -dp %{buildroot}%{_unitdir}
-PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
-        install.bin \
-%if 0%{?fedora}
-        install.remote \
+%if %{with varlink}
+%gogenerate ./pkg/varlink/...
 %endif
-        install.man \
-        install.cni \
-        install.systemd \
-        install.completions \
-        install.docker
+
+# build %%{name}
+export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
+%if %{with varlink}
+export BUILDTAGS+=" varlink"
+%endif
+%if 0%{?centos}
+export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion containers_image_ostree_stub"
+%endif
+
+# build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here?
+LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
+
+%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
+
+%if 0%{?fedora} || 0%{?centos} >= 8
+# build %%{name}-remote
+export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote"
+%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
+%endif
+
+%{__make} docs
+
+%install
+PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \
+               ETCDIR=%{buildroot}%{_sysconfdir} \
+%if %{with varlink}
+               BUILDTAGS="varlink" \
+%endif
+               install.bin-nobuild \
+%if 0%{?fedora} || 0%{?centos} >= 8
+               install.remote-nobuild \
+%endif
+               install.man-nobuild \
+               install.cni \
+               install.systemd \
+               install.completions \
+               install.docker

 mv pkg/hooks/README.md pkg/hooks/README-hooks.md

-# install libpod.conf
-install -dp %{buildroot}%{_datadir}/containers
-install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers
-
 # install plugins
 pushd dnsname-%{commit_plugins}
 %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
@ -515,10 +555,14 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},,
 done

 # do not install remote manpages on centos7
-%if 0%{?centos} < 8
-rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1
-rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1
-rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5
+%if ! 0%{?fedora} && 0%{?centos} < 8
+rm -f %{buildroot}%{_mandir}/man1/docker-remote.1
+rm -f %{buildroot}%{_mandir}/man1/%{name}-remote.1
+rm -f %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5
+rm -f %{buildroot}%{_datadir}/bash-completion/completions/%{name}-remote
+rm -f %{buildroot}%{_datadir}/zsh/site-functions/_%{name}-remote
+rm -f %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish
+rm -f %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %endif

 # source codes for building projects
@ -595,21 +639,32 @@ exit 0
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}

-%files -f podman.file-list
+%files -f %{name}.file-list
 %license LICENSE
-%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
 %{_bindir}/%{name}
-%{_datadir}/bash-completion/completions/*
+%{_datadir}/bash-completion/completions/%{name}
 # By "owning" the site-functions dir, we don't need to Require zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_%{name}
+%dir %{_datadir}/fish/vendor_completions.d
+%{_datadir}/fish/vendor_completions.d/%{name}.fish
 %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
-%{_datadir}/containers/%{repo}.conf
+%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}.socket
+%{_unitdir}/%{name}-auto-update.service
+%{_unitdir}/%{name}-auto-update.timer
+%{_userunitdir}/%{name}.service
+%{_userunitdir}/%{name}.socket
+%{_userunitdir}/%{name}-auto-update.service
+%{_userunitdir}/%{name}-auto-update.timer
+%if %{with varlink}
 %{_unitdir}/io.%{name}.service
 %{_unitdir}/io.%{name}.socket
 %{_userunitdir}/io.%{name}.service
 %{_userunitdir}/io.%{name}.socket
-%{_usr}/lib/tmpfiles.d/%{name}.conf
+%{_tmpfilesdir}/%{name}.conf
+%endif

 %files docker
 %{_bindir}/docker
@ -619,35 +674,262 @@ exit 0
 %if 0%{?with_devel}
 %files -n libpod-devel -f devel.file-list
 %license LICENSE
-%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
 %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
 %endif

 %if 0%{?with_unit_test} && 0%{?with_devel}
 %files unit-test-devel -f unit-test-devel.file-list
 %license LICENSE
-%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
 %endif

 #### DO NOT REMOVE - NEEDED FOR CENTOS
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos} >= 8
 %files remote
 %license LICENSE
 %{_bindir}/%{name}-remote
-%{_mandir}/man1/%{name}-remote*.1*
-%{_mandir}/man5/%{name}-remote*.5*
+%{_mandir}/man1/%{name}-remote*.*
+%{_datadir}/bash-completion/completions/%{name}-remote
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_completions.d
+%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_%{name}-remote
+%endif

 %files tests
 %license LICENSE
-%{_datadir}/%{name}/test
-%endif
+%dir %{_datadir}/%{name}/test
+%dir %{_datadir}/%{name}/test/system
+%{_datadir}/%{name}/test/system/*

 %files plugins
 %license dnsname-%{commit_plugins}/LICENSE
 %doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md}
 %{_libexecdir}/cni/dnsname

+# rhcontainerbot account currently managed by lsm5
 %changelog
+* Mon Jan 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.1-2
+- bump release
+
+* Tue Dec  8 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.1-1
+- autobuilt v2.2.1
+
+* Mon Dec  7 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-4
+- bump release tag to make centos OBS happy
+
+* Mon Dec  7 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-3
+- harden cgo based golang binaries
+- Reported-by: Wade Mealing <wmealing@gmail.com>
+
+* Tue Dec  1 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-2
+- use podman-plugins / dnsname upstream v1.1.1
+
+* Tue Dec  1 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-1
+- autobuilt v2.2.0
+
+* Tue Nov 24 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.6.rc2
+- autobuilt v2.2.0-rc2
+
+* Mon Nov 23 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-0.5.rc1
+- handle centos7
+
+* Fri Nov 20 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-0.4.rc1
+- use latest containers-common 1.2.0-9
+
+* Wed Nov 18 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-0.3.rc1
+- podman-plugins should require podman otherwise it can cause funny upgrade
+scenarios, where if "podman" upgrade fails, "podman-plugins" could still
+succeed
+
+* Wed Nov 18 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.2.0-0.2.rc1
+- require containers-common 1:1.2.0-8 for shortnames
+
+* Wed Nov 18 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.1.rc1
+- autobuilt v2.2.0-rc1
+
+* Wed Nov 18 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-13
+- bump dnsname to v1.1.0, commit a9c2a10
+
+* Sun Oct  4 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-10
+- fix permission denied issue when using --net=host
+
+* Fri Oct  2 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-9
+- fix capset issue on podman run (upstream PR#7898)
+- Requires containers-common >= %%epoch:1.2.0-2
+
+* Fri Oct  2 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-8
+- Requires: (container-selinux if selinux-policy)
+
+* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-7
+- fix crun gating test issue
+- bump release tag to preserve upgrade path
+
+* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-6
+- fedora Requires: crun-0.15-4
+
+* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-5
+- fedora requires crun >= 0.15-3
+
+* Sun Sep 27 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-4
+- correct bad date in changelog
+
+* Sun Sep 27 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-3
+- adjust deps for centos7
+
+* Wed Sep 23 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-1
+- bump to v2.1.1
+
+* Wed Sep 23 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.0-2
+- podman-plugins is a weak dep for podman
+
+* Tue Sep 22 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-1
+- autobuilt v2.1.0
+- Resolves: #1874268, #1881345 - CVE-2020-14370
+
+* Fri Sep 18 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.0-0.5.rc2
+- fix release tag
+
+* Thu Sep 17 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-0.4.rc1
+- autobuilt v2.1.0-rc2
+
+* Wed Sep 16 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.0-0.3.rc1
+- plugins requires dnsmasq
+
+* Mon Sep 14 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.0-0.2.rc1
+- use correct release tag
+
+* Mon Sep 14 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-0.1.rc1
+- autobuilt v2.1.0-rc1
+
+* Tue Sep 01 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.6-1
+- bump to v2.0.6
+
+* Fri Aug 28 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.6-0.2.rc1
+- autobuilt v2.0.6-rc1
+
+* Tue Aug 25 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.5-2
+- buildinfo in LDFLAGS
+
+* Mon Aug 24 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.5-1
+- autobuilt v2.0.5
+
+* Fri Jul 31 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.4-1
+- autobuilt v2.0.4
+
+* Thu Jul 23 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.3-1
+- autobuilt v2.0.3
+
+* Sun Jul 12 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.2-2
+- re-enable varlink for centos8
+
+* Tue Jul 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.2-1
+- autobuilt v2.0.2
+
+* Fri Jun 26 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.1-1
+- bump to v2.0.1
+
+* Sat Jun 20 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-2
+- depend on conmon-2:2.0.18-1
+
+* Fri Jun 19 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-1
+- bump to v2.0.0
+
+* Wed Jun 17 2020 Brent Baude <bbaude@redhat.com> - 2:2.0.0-0.3.rc7
+- built v2.0.0-rc7
+
+* Mon Jun 15 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-0.2.rc6
+- built v2.0.0-rc6
+
+* Mon Jun 15 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-0.1.rc5
+- correct release tag format
+
+* Wed Jun 10 2020 Brent Baude <bbaude@redhat.com> - 2:2.0.0-rc5
+- rc5
+
+* Mon Jun 8 2020 Dan Walsh <dwalsh@fedoraproject.org> - 2:2.0.0-rc4.1
+- Remove /etc/modules-load.d/podman.conf
+
+* Thu Jun 04 2020 Brent Baude <bbaude@redhat.com> - 2:2.0.0-rc4
+- rc4
+
+* Mon May 25 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.3-1
+- bump to v1.9.3
+- require conmon >= 2:2.0.16-3
+
+* Fri May 15 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.2-2
+- use correct epoch for conmon
+
+* Wed May 13 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.2-1
+- bump to v1.9.2
+- update min deps on conmon and cni plugins
+
+* Wed Apr 29 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.1-1
+- new version
+
+* Wed Apr 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.9.0-1
+- autobuilt v1.9.0
+
+* Tue Apr 14 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.9.0-0.5.rc1
+- autobuilt v1.9.0-rc2
+
+* Mon Apr 13 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.0-0.4.rc1
+- rewrite container-selinux conditionals more cleanly
+
+* Mon Apr 13 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.0-0.3.rc1
+- correct varlink go generate
+- container-selinux is a recommends for fedora and centos8 but requires for centos7
+
+* Mon Apr 13 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.2-0.2.rc1
+- autobuilt v1.9.0-rc1
+
+* Mon Mar 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.2-3
+- Resolves: gh#5316
+
+* Fri Mar 20 2020 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.8.2-2
+- Install the APIV2 services
+
+* Thu Mar 19 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.2-1
+- autobuilt v1.8.2
+
+* Wed Mar 18 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.1-0.2.rc1
+- autobuilt v1.8.2-rc1
+
+* Wed Mar 11 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-2
+- bump cause previous release went bad somewhere at fedora-infra
+
+* Wed Mar 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.1-1
+- autobuilt v1.8.1
+
+* Tue Mar 10 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.7.rc4
+- correct release tag
+
+* Tue Mar 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.1-0.6.rc3
+- autobuilt v1.8.1-rc4
+
+* Sat Mar 07 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.5.rc3
+- bump to v1.8.1-rc3
+
+* Sun Mar 01 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.4.rc2
+- correct changelog
+
+* Sun Feb 23 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.3.rc1
+- bump to v1.8.1-rc1
+
+* Sun Feb 23 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.0-5
+- Resolves: #1806147 - correct buildtags for podman-remote
+
+* Tue Feb 18 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.0-4
+- bump to v1.8.0
+- autobuilt 2ced909
+- cosmetic changes for autobuilds
+
+* Tue Feb 18 2020 Dan Walsh <dwalsh5@fedoraproject.org> - 2:1.8.0-3.git5092c07
+- Bump release to make sure new version installs on F32 and remove -dev branch
+
 * Thu Feb 06 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.0-0.4.dev.git5092c07
 - bump crun dependency

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc
-SHA512 (libpod-5092c07.tar.gz) = 207a78efcfb1fb85e2b297ba1a04b5ebef0f6423f747289f0c547c51e34c16d7a39149eb2854008695ccc177f0e58013184b4c4765de71ca272c635e443c0e55
+SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0
+SHA512 (v2.2.1.tar.gz) = 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367