From 8eaf7830d2ed459b2654b97e0d741e0a3623fd10 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Sep 21 2017 22:11:59 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index e68ca0c..5c7cdc4 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -159,6 +159,9 @@ pushd registries-%{commit_atomic_registries} %make_install install -d %{buildroot}%{_sysconfdir}/containers/ +%if 0%{?centos_ver} = 7 +install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/registries.conf +%else %if 0%{?rhel} install -p -m 644 registries.redhat %{buildroot}%{_sysconfdir}/containers/registries.conf %else @@ -168,6 +171,7 @@ install -p -m 644 registries.redhat %{buildroot}%{_sysconfdir}/containers/regist install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/ %endif %endif +%endif install -d %{buildroot}%{_unitdir} install -p -m 644 registries.service %{buildroot}%{_unitdir} @@ -200,6 +204,9 @@ make check %{_unitdir}/registries.service %changelog +* Thu Sep 21 2017 Johnny Hughes - 1:1.18.1-4.git64843d3 +- Manual CentOS Debranding + * Tue Aug 08 2017 Lokesh Mandvekar - 1:1.18.1-4.git64843d3 - Resolves: #1479551 - depend on skopeo >= 1:0.1.23