diff --git a/.gitignore b/.gitignore index 7d76f99..acfca49 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /containerd-b818e74.tar.gz /docker-91ae1d1.tar.gz /runc-aa86071.tar.gz +/docker-storage-setup-ba0dcf3.tar.gz diff --git a/docker-latest.spec b/docker-latest.spec index bfac938..afe44d0 100644 --- a/docker-latest.spec +++ b/docker-latest.spec @@ -35,7 +35,7 @@ # d-s-s %global git1 https://github.com/projectatomic/%{repo}-storage-setup/ -%global commit1 308c5e37223e54072a6b4be1dd8998aad7e91e65 +%global commit1 ba0dcf3f02bee36f188164517911b20f8798a160 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global dss_libdir %{_exec_prefix}/lib/%{repo}-storage-setup @@ -80,7 +80,7 @@ Name: %{repo}-latest Epoch: 2 %endif Version: 1.12.3 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -590,17 +590,7 @@ install -dp %{buildroot}%{_sysconfdir}/%{name} # install d-s-s pushd %{repo}-storage-setup-%{commit1} -install -d %{buildroot}%{_bindir} -install -p -m 755 %{repo}-storage-setup.sh %{buildroot}%{_bindir}/%{name}-storage-setup -install -d %{buildroot}%{_unitdir} -install -p -m 644 %{repo}-storage-setup.service %{buildroot}%{_unitdir}/%{name}-storage-setup.service -install -d %{buildroot}%{dss_libdir} -install -p -m 644 %{repo}-storage-setup.conf %{buildroot}%{dss_libdir}/%{name}-storage-setup -install -p -m 755 libdss.sh %{buildroot}%{dss_libdir} -install -d %{buildroot}%{_mandir}/man1 -install -p -m 644 %{repo}-storage-setup.1 %{buildroot}%{_mandir}/man1/%{name}-storage-setup.1 -install -d %{buildroot}%{_sysconfdir}/sysconfig -install -p -m 644 %{repo}-storage-setup-override.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name}-storage-setup +make install DESTDIR=%{buildroot} popd # install v1.10-migrator @@ -712,6 +702,16 @@ ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/ %{_datadir}/rhel/secrets/rhsm %changelog +* Wed Nov 02 2016 Antonio Murdaca - 2:1.12.3-3.git91ae1d1 +- built docker @projectatomic/docker-1.12 commit 91ae1d1 +- built docker-selinux commit +- built d-s-s commit ba0dcf3 +- built docker-novolume-plugin commit +- built docker-runc @projectatomic/runc-1.12 commit aa86071 +- built docker-utils commit +- built docker-containerd commit b818e74 +- built docker-v1.10-migrator commit 994c35c + * Mon Oct 31 2016 Antonio Murdaca - 2:1.12.3-2.git91ae1d1 - built docker @projectatomic/docker-1.12 commit 91ae1d1 - built docker-selinux commit diff --git a/sources b/sources index a761bc9..129e714 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ f8c2d3bc4573db5f76d7230131cbebb4 containerd-b818e74.tar.gz 78b1788a090b20a6599597bc9b9fe5d6 docker-91ae1d1.tar.gz -7fb67471c9481829b014ccf52c901e1e docker-storage-setup-308c5e3.tar.gz +78548f8766ff682b548cc04e513cc5c3 docker-storage-setup-ba0dcf3.tar.gz 91a302a9f817d5d3731a7e033bb0ebbe runc-aa86071.tar.gz 1f7d112be5ba2380804762d965f9954d v1.10-migrator-994c35c.tar.gz