From 756fee04092c6ae45953f044e27a0587ab33217c Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: May 18 2018 15:54:18 +0000
Subject: Add labels to allow podman to be run from a systemd unit file


---

diff --git a/.gitignore b/.gitignore
index 644c033..041a4e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
 /container-selinux-bdc0137.tar.gz
 /container-selinux-55c7d4d.tar.gz
 /container-selinux-d248f91.tar.gz
+/container-selinux-d213769.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 15610c7..dabdc01 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,12 +3,13 @@
 # container-selinux
 %global git0 https://github.com/projectatomic/container-selinux
 %if 0%{?fedora} || 0%{?rhel} > 7
-%global commit0 d248f9197acde3e7c489f2ee09c10f8b29ef1a68
+%global commit0 d2137698cba817ee241a02210b7d63473bd38233
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %else
 # use upstream's RHEL-1.12 branch for CentOS 7
-%global commit0 56c32da8a72f9e7af5daeaebac5b887830d123b1
+%global el_commit0 56c32da8a72f9e7af5daeaebac5b887830d123b1
+%global shortcommit0 %(c=%{el_commit0}; echo ${c:0:7})
 %endif
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # container-selinux stuff (prefix with ds_ for version/release etc.)
 # Some bits borrowed from the openstack-selinux package
@@ -35,13 +36,18 @@ Name: container-selinux
 %if 0%{?fedora} || 0%{?centos} || 0%{?rhel} > 7
 Epoch: 2
 %endif
-Version: 2.55
-Release: 1%{?dist}
+Version: 2.58
+Release: 1.git%{shortcommit0}%{?dist}
 License: GPLv2
 URL: %{git0}
 Summary: SELinux policies for container runtimes
+%if 0%{?fedora} || 0%{?rhel} >7
 Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+%else
+Source0: %{git0}/archive/%{el_commit0}/%{name}-%{shortcommit0}.tar.gz
+%endif
 BuildArch: noarch
+BuildRequires: git
 BuildRequires: pkgconfig(systemd)
 BuildRequires: selinux-policy >= %{selinux_policyver}
 BuildRequires: selinux-policy-devel >= %{selinux_policyver}
@@ -64,7 +70,11 @@ Provides: docker-selinux = %{epoch}:%{version}-%{release}
 SELinux policy modules for use with container runtimes.
 
 %prep
-%setup -q -n %{name}-%{commit0}
+%if 0%{?fedora} || 0%{?rhel} > 7
+%autosetup -Sgit -n %{name}-%{commit0}
+%else
+%autosetup -Sgit -n %{name}-%{el_commit0}
+%endif
 
 %build
 make
@@ -117,6 +127,42 @@ fi
 %{_datadir}/selinux/*
 
 %changelog
+* Fri May 18 2018 Dan Walsh <dwalsh@fedoraproject.org> - 2.57-1
+- Add labels to allow podman to be run from a systemd unit file
+
+* Tue Apr 17 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-12.gitd248f91
+- autobuilt commit d248f91
+
+* Tue Apr 17 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-11.gitd248f91
+- autobuilt commit d248f91
+
+* Mon Apr 16 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-10.gitd248f91
+- autobuilt commit d248f91
+
+* Mon Apr 16 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-9.gitd248f91
+- autobuilt commit d248f91
+
+* Mon Apr 16 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-8
+- autobuilt commit d248f91
+
+* Mon Apr 16 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-7
+- autobuilt commit d248f91
+
+* Mon Apr 16 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-6
+- autobuilt commit d248f91
+
+* Mon Apr 09 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-5
+- autobuilt commit d248f91
+
+* Mon Apr 09 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.55-4
+- autobuilt commit d248f91
+
+* Mon Apr 09 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.55-3
+- autobuilt commit d248f91
+
+* Mon Apr 09 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.55-2
+- autobuilt commit d248f91
+
 * Thu Mar 15 2018 Dan Walsh <dwalsh@fedoraproject.org> - 2.55-1
 - Dontaudit attempts by containers to write to /proc/self
 
@@ -141,7 +187,7 @@ fi
 - Change default label of /exports to container_var_lib_t
 
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2:2.46-3
-- Escape macros in %%changelog
+- Escape macros in %%CHANGELOG
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.46-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index eb6df7c..480858b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (container-selinux-d248f91.tar.gz) = 28f7a36228581fce097f3c0a3798a727300f609dc927d976c4cf0d8c10834a3695503b1f340bc73ba86fdca4906cd12cf0c73804a40dfd1e99aecaa9e2bc3917
+SHA512 (container-selinux-d213769.tar.gz) = 94c3b6b097b9ad6b943bfec4b0d28d38a6fd10057b75c4236f03e52383361d1209d4c96acd02c2295707db037b26e5269eec5ead077bd90017518ea58fd5cc7a