From 45f4b9211aa16a985c4216bf554018de253907e0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 23:33:01 +0000
Subject: import atomic-1.22.1-33.gitb507039.el7_8


---

diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec
index 12f2ce9..e48af5c 100644
--- a/SPECS/atomic.spec
+++ b/SPECS/atomic.spec
@@ -25,7 +25,7 @@
 Name: atomic
 Epoch: 1
 Version: 1.22.1
-Release: 29.git%{shortcommit0}%{?dist}
+Release: 33.git%{shortcommit0}%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/%{name}
@@ -162,6 +162,13 @@ EOF
 #moved to skopeo - should not be present in future tarballs
 rm -rf %{buildroot}%{_sysconfdir}/containers
 
+# /var/lib/atomic to be a symlink to /var/lib/containers
+# provided by skopeo (containers-common subpackage)
+install -d %{buildroot}%{_sharedstatedir}
+cd %{buildroot}%{_sharedstatedir}
+ln -s containers atomic
+cd -
+
 cd ..
 pushd registries-%{commit_atomic_registries}
 make install DESTDIR=%{buildroot}
@@ -179,6 +186,11 @@ cd ..
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
+%pre
+# be sure /var/lib/atomic doesn't exist to not to trigger
+# directory to symlink RPM update failure
+rm -rf %{_sharedstatedir}/atomic
+
 %files -f atomic.files
 %license COPYING
 %doc README.md
@@ -189,6 +201,7 @@ cd ..
 %config(noreplace) %{_sysconfdir}/%{name}.d/openscap
 %endif
 %dir %{_sysconfdir}/%{name}.d
+%{_sharedstatedir}/atomic
 
 %files registries
 %license ../registries-%{commit_atomic_registries}/COPYING 
@@ -201,6 +214,21 @@ cd ..
 %{pysitelib}/registries-*.egg-info
 
 %changelog
+* Fri Mar 27 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.22.1-33.gitb507039
+- /var/lib/atomic to be a symlink to /var/lib/containers
+  provided by skopeo (containers-common subpackage)
+- Resolves: #1817605
+
+* Fri Jan 24 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.22.1-32.gitb507039
+- resurrect s390x arch as kernel there now has the renameat2 syscall (#1773504)
+
+* Fri Jan 17 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.22.1-31.gitb507039
+- build against extras-rhel-7.8-go-toolset-candidate
+
+* Thu Jan 16 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.22.1-30.gitb507039
+- temporary disable s390x arch due to #1773504 causing fuse-overlayfs
+  failing to build - skopeo/contaners-common requires it
+
 * Wed Aug 14 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:1.22.1-29.gitb507039
 - Resolves: #1741270 - restore the main rpm