From 1f0bf8bb2d6ea6b3e9cc4e3346d98e51c06086c4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Aug 14 2015 14:00:57 +0000 Subject: EVR: 1:1.9.0-2.gitf8950e0 - built docker @rhatdan/fedora-1.9 commit#f8950e0 - built d-s-s master commit#ac1b30e - built docker-selinux master commit#16ebd81 - built docker-utils master commit#dab51ac Signed-off-by: Lokesh Mandvekar --- diff --git a/.gitignore b/.gitignore index 6ab5084..f3337e5 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /dab51acd1b1a77f7cb01a1b7e2129ec85c846b71.tar.gz /docker-b4e2cc5.tar.gz /docker-storage-setup-ac1b30e.tar.gz +/docker-f8950e0.tar.gz diff --git a/docker.spec b/docker.spec index e500614..d4b3d99 100644 --- a/docker.spec +++ b/docker.spec @@ -39,7 +39,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # docker stuff (prefix with d_) -%global d_commit b4e2cc594f9a52057e700996718a97579b51e7c1 +%global d_commit f8950e08f120770f5555a1110f7212b23cb4c581 %global d_shortcommit %(c=%{d_commit}; echo ${c:0:7}) # d-s-s stuff (prefix with dss_) @@ -84,7 +84,7 @@ Name: %{repo} Epoch: 1 Version: 1.9.0 -Release: 1.git%{d_shortcommit}%{?dist} +Release: 2.git%{d_shortcommit}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.%{repo}.com @@ -515,6 +515,8 @@ install -p -m 644 %{repo}-storage-setup.conf %{buildroot}%{dss_libdir}/%{repo}-s 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 +install -d %{buildroot}%{_sysconfdir}/sysconfig +install -p -m 644 %{repo}-storage-setup-override.conf %{buildroot}%{_sysconfdir}/sysconfig/%{repo}-storage-setup popd %check @@ -584,6 +586,7 @@ fi %{_udevrulesdir}/80-%{repo}.rules %{_sysconfdir}/%{repo} # d-s-s specific +%config(noreplace) %{_sysconfdir}/sysconfig/%{repo}-storage-setup %{_unitdir}/%{repo}-storage-setup.service %{_bindir}/%{repo}-storage-setup %{dss_libdir}/%{repo}-storage-setup @@ -628,6 +631,12 @@ fi %{_bindir}/%{repo}tarsum %changelog +* Fri Aug 14 2015 Lokesh Mandvekar - 1:1.9.0-2.gitf8950e0 +- built docker @rhatdan/fedora-1.9 commit#f8950e0 +- built d-s-s master commit#ac1b30e +- built docker-selinux master commit#16ebd81 +- built docker-utils master commit#dab51ac + * Thu Aug 13 2015 Lokesh Mandvekar - 1:1.9.0-1 - built docker @rhatdan/fedora-1.9 commit#b4e2cc5 - built d-s-s master commit#ac1b30e diff --git a/sources b/sources index a4d62c1..352a209 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 41de66f15f8151b1cb81b8d88c14d0e1 dab51acd1b1a77f7cb01a1b7e2129ec85c846b71.tar.gz -2a42ed04d5bf2a35559e3ca55de03e56 docker-b4e2cc5.tar.gz +af2b13ddf64f66be84ae2065d6aab67b docker-f8950e0.tar.gz 38b8e082ef8113d3d04558c8908d1cc3 docker-selinux-16ebd81.tar.gz 65373468868d40bce22dc4d8555f42a4 docker-storage-setup-ac1b30e.tar.gz