NVR: docker-2:1.12.1-21.git2649fe1

- built docker-selinux commit fd38eaf
- require selinux-policy >= 3.13.1-213

Signed-off-by: Lokesh Mandvekar <[email protected]>

.gitignore

@@ -63,3 +63,4 @@
 /runc-f509e50.tar.gz
 /docker-f1040da.tar.gz
 /docker-2649fe1.tar.gz
+/docker-selinux-fd38eaf.tar.gz

docker.spec

@@ -42,7 +42,7 @@
 # docker-selinux
 %global git2 https://github.com/projectatomic/%{repo}-selinux
 %if 0%{?fedora}
-%global commit2 bcd65288e6109a5b13c57a836d685b8a8313001f
+%global commit2 fd38eafe61f9c20fde78b2374e0a7a57f99e1f81
 %else
 %global commit2 032bcda7b1eb6d9d75d3c0ce64d9d35cdb9c7b85
 %endif
@@ -84,7 +84,7 @@
 
 # Version of SELinux we were using
 %if 0%{?fedora} >= 22
-%global selinux_policyver 3.13.1-155
+%global selinux_policyver 3.13.1-213
 %else
 %global selinux_policyver 3.13.1-39
 %endif
@@ -94,7 +94,7 @@ Name: %{repo}
 Epoch: 2
 %endif
 Version: 1.12.1
-Release: 20.git%{shortcommit0}%{?dist}
+Release: 21.git%{shortcommit0}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -598,8 +598,8 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}
 install -p -m 644 %{SOURCE14} %{buildroot}%{_unitdir}
 
 # install novolume-plugin executable, unitfile, socket and man
-install -d %{buildroot}%{_libexecdir}/docker
-install -p -m 755 _build/src/%{repo}-novolume-plugin %{buildroot}%{_libexecdir}/docker
+install -d %{buildroot}%{_libexecdir}/%{repo}
+install -p -m 755 _build/src/%{repo}-novolume-plugin %{buildroot}%{_libexecdir}/%{repo}
 install -p -m 644 %{repo}-novolume-plugin-%{commit4}/systemd/%{repo}-novolume-plugin.service %{buildroot}%{_unitdir}
 install -p -m 644 %{repo}-novolume-plugin-%{commit4}/systemd/%{repo}-novolume-plugin.socket %{buildroot}%{_unitdir}
 install -d %{buildroot}%{_mandir}/man8
@@ -625,17 +625,17 @@ install -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{repo}-storag
 %_format MODULES $x.pp.bz2
 install -d %{buildroot}%{_datadir}/selinux/packages
 install -d -p %{buildroot}%{_datadir}/selinux/devel/include/services
-install -p -m 644 %{name}-selinux-%{commit2}/docker.if %{buildroot}%{_datadir}/selinux/devel/include/services/docker.if
+install -p -m 644 %{name}-selinux-%{commit2}/%{repo}.if %{buildroot}%{_datadir}/selinux/devel/include/services/%{repo}.if
 install -m 0644 %{repo}-selinux-%{commit2}/$MODULES %{buildroot}%{_datadir}/selinux/packages
 
 %if 0%{?with_unit_test}
-install -d -m 0755 %{buildroot}%{_sharedstatedir}/docker-unit-test/
-cp -pav VERSION Dockerfile %{buildroot}%{_sharedstatedir}/docker-unit-test/.
+install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{repo}-unit-test/
+cp -pav VERSION Dockerfile %{buildroot}%{_sharedstatedir}/%{repo}-unit-test/.
 for d in */ ; do
-  cp -rpav $d %{buildroot}%{_sharedstatedir}/docker-unit-test/
+  cp -rpav $d %{buildroot}%{_sharedstatedir}/%{repo}-unit-test/
 done
 # remove docker.initd as it requires /sbin/runtime no packages in Fedora
-rm -rf %{buildroot}%{_sharedstatedir}/docker-unit-test/contrib/init/openrc/docker.initd
+rm -rf %{buildroot}%{_sharedstatedir}/%{repo}-unit-test/contrib/init/openrc/docker.initd
 %endif
 
 # source codes for building projects
@@ -825,6 +825,10 @@ exit 0
 %{_datadir}/rhel/secrets/rhsm
 
 %changelog
+* Fri Sep 02 2016 Lokesh Mandvekar <[email protected]> - 2:1.12.1-21.git2649fe1
+- built docker-selinux commit fd38eaf
+- require selinux-policy >= 3.13.1-213
+
 * Fri Sep 02 2016 Antonio Murdaca <[email protected]> - 2:1.12.1-20.git2649fe1
 - bump release to ensure stable upgrade path from f25 to Rawhide
 

sources

@@ -1,7 +1,7 @@
 f0a0c1101ad259b84fb457c8c7036723  containerd-0ac3cd1.tar.gz
 4f63c776bd71353420cc0ea104aa8692  docker-2649fe1.tar.gz
 e237e3422b74ab7d98364cc753597377  docker-novolume-plugin-7715854.tar.gz
-9b94d69d40e7f79e713b1263e90e8efa  docker-selinux-bcd6528.tar.gz
+21012db1ed70ca2ddcea117e56f274df  docker-selinux-fd38eaf.tar.gz
 feefc81a3ced4cbf48218b75f2d48bf1  docker-storage-setup-194eca2.tar.gz
 dc2d22277e9bda313116c9a513f10597  runc-f509e50.tar.gz
 1f7d112be5ba2380804762d965f9954d  v1.10-migrator-994c35c.tar.gz