From 575a6c95c6f28c24bf54c9f89c4b67261d1b55c2 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Jun 09 2015 19:05:30 +0000
Subject: Include docker-storage-setup in the main package


This build will obsolete the docker-storage-setup package which is also being
retired in parallel.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

---

diff --git a/docker.spec b/docker.spec
index c145b53..8a5b7dd 100644
--- a/docker.spec
+++ b/docker.spec
@@ -15,6 +15,11 @@
 %global d_commit 5b82e1d3e552cca642ff3cacc8ad31589eb6e206
 %global d_shortcommit %(c=%{d_commit}; echo ${c:0:7})
 
+# d-s-s stuff (prefix with dss_)
+%global dss_libdir %{_prefix}/lib/docker-storage-setup
+%global dss_commit 2cdf16f3b50456d9f21f370b26bab5dc2acb0caa
+%global dss_shortcommit %(c=%{dss_commit}; echo ${c:0:7})
+
 #%global tar_import_path code.google.com/p/go/src/pkg/archive/tar
 
 # docker-selinux conditional
@@ -45,7 +50,7 @@
 
 Name: %{repo}
 Version: 1.7.0
-Release: 2.git%{d_shortcommit}%{?dist}
+Release: 4.git%{d_shortcommit}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: http://www.%{repo}.com
@@ -58,6 +63,14 @@ Source3: %{repo}-storage.sysconfig
 Source4: %{repo}-logrotate.sh
 Source5: README.%{repo}-logrotate
 Source6: %{repo}-network.sysconfig
+# Source7 is the source tarball for docker-storage-setup
+Source7:
+https://github.com/projectatomic/%{repo}-storage-setup/archive/%{dss_commit}/%{repo}-storage-setup-%{dss_shortcommit}.tar.gz
+
+%if 0%{?fedora}
+Patch0: add-debug-info.patch
+%endif
+
 %if 0%{?with_selinux}
 Source7: https://github.com/fedora-cloud/%{repo}-selinux/archive/%{ds_commit}/%{repo}-selinux-%{ds_shortcommit}.tar.gz
 %endif # with_selinux
@@ -94,6 +107,12 @@ Provides: %{repo}-io = %{version}-%{release}
 Obsoletes: %{repo}-io < %{version}-21
 %endif
 
+# include d-s-s into main docker package and obsolete existing d-s-s rpm
+# also update BRs and Rs
+Requires: lvm2
+Requires: xfsprogs
+Obsoletes: %{repo}-storage-setup <= 0.5-3
+
 %description
 Docker is an open-source engine that automates the deployment of any
 application as a lightweight, portable, self-sufficient container that will
@@ -273,6 +292,9 @@ This package installs %{summary}.
 cp %{SOURCE5} .
 sed -i 's/$/%{?dist}/' VERSION
 
+# untar d-s-s
+tar zxf %{SOURCE7}
+
 %if 0%{?with_selinux}
 # unpack %{repo}-selinux
 tar zxf %{SOURCE7}
@@ -396,6 +418,20 @@ done
 # install %{repo} config directory
 install -dp %{buildroot}%{_sysconfdir}/%{repo}
 
+# install d-s-s
+pushd %{repo}-storage-setup-%{dss_commit}
+install -d %{buildroot}%{_bindir}
+install -p -m 755 docker-storage-setup.sh
+%{buildroot}%{_bindir}/docker-storage-setup
+install -d %{buildroot}%{_unitdir}
+install -p -m 644 docker-storage-setup.service %{buildroot}%{_unitdir}
+install -d %{buildroot}%{dss_libdir}
+install -p -m 644 docker-storage-setup.conf
+%{buildroot}%{dss_libdir}/docker-storage-setup
+install -d %{buildroot}%{_mandir}/man1
+install -p -m 644 docker-storage-setup.1 %{buildroot}%{_mandir}/man1
+popd
+
 %check
 [ ! -e /run/%{repo}.sock ] || {
     mkdir test_dir
@@ -459,6 +495,10 @@ fi
 %dir %{_sharedstatedir}/%{repo}
 %{_sysconfdir}/udev/rules.d/80-%{repo}.rules
 %{_sysconfdir}/%{repo}
+# d-s-s specific
+%{_unitdir}/%{repo}-storage-setup.service
+%{_bindir}/%{repo}-storage-setup
+%{dss_libdir}/%{repo}-storage-setup
 
 %files devel
 %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md 
@@ -488,6 +528,10 @@ fi
 %{_datadir}/zsh/site-functions/_%{repo}
 
 %changelog
+* Tue Jun 09 2015 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.7.0-4.gitdcff4e1
+- Include d-s-s into the main docker package
+- Obsolete docker-storage-setup <= 0.5-3
+
 * Mon Jun 08 2015 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.7.0-3.git5b82e1d
 - BR golang-1.4.2 or greater
 - remove netns_linux_amd.go for x86_64