lsm5 pushed to docker (f22). "build @rhatdan/fedora-1.6 commit#b27feb4 (..more)"

[notifications at fedoraproject.org]

>From b0957fd78ee9aeea093dd4cec05008c96f327a0a Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Tue, 14 Apr 2015 22:19:06 -0500
Subject: build @rhatdan/fedora-1.6 commit#b27feb4

NVR: docker-1.6.0-2.rc6

- contains 1.6.0-rc6 + redhat patches
- GOTRACEBACK=crash moved to unitfile

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

diff --git a/.gitignore b/.gitignore
index fc13f66..248b94c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /docker-selinux-4421e0d.tar.gz
 /docker-8150fb6.tar.gz
 /docker-fc4825d.tar.gz
+/docker-b27feb4.tar.gz
diff --git a/docker.service b/docker.service
index 65fd0df..3f5e103 100644
--- a/docker.service
+++ b/docker.service
@@ -8,6 +8,7 @@ Type=notify
 EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-network
+Environment=GOTRACEBACK=crash
 ExecStart=/usr/bin/docker -d \
           $OPTIONS \
           $DOCKER_STORAGE_OPTIONS \
diff --git a/docker.spec b/docker.spec
index a90b4f9..99c7ff5 100644
--- a/docker.spec
+++ b/docker.spec
@@ -12,7 +12,7 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 
 # docker stuff (prefix with d_)
-%global d_commit fc4825d5ef5e0e1af74904208f9b925c22f0b6f8
+%global d_commit b27feb4ff804f335c80861b17a4e2bfc29fbbf45
 %global d_shortcommit %(c=%{d_commit}; echo ${c:0:7})
 
 %global tar_import_path code.google.com/p/go/src/pkg/archive/tar
@@ -40,13 +40,13 @@
 
 Name: %{repo}
 Version: 1.6.0
-Release: 0.1.rc5%{?dist}
+Release: 0.2.rc6%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: http://www.%{repo}.com
 ExclusiveArch: x86_64 %{arm}
-#Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Source0: https://github.com/jfrazelle/%{repo}/archive/%{d_commit}/%{repo}-%{d_shortcommit}.tar.gz
+# Branch used: https://github.com/rhatdan/docker/commits/fedora-1.6
+Source0: https://github.com/rhatdan/%{repo}/archive/%{d_commit}/%{repo}-%{d_shortcommit}.tar.gz
 Source1: %{repo}.service
 Source2: %{repo}.sysconfig
 Source3: %{repo}-storage.sysconfig
@@ -296,9 +296,9 @@ install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_libexecdir}/%{repo}
 
 # Grab the first thing from -dev
-for x in bundles/%{version}-rc5; do \
-  install -p -m 755 $x/dynbinary/%{repo}-%{version}-rc5 %{buildroot}%{_bindir}/%{repo}
-  install -p -m 755 $x/dynbinary/%{repo}init-%{version}-rc5 %{buildroot}%{_libexecdir}/%{repo}/%{repo}init
+for x in bundles/%{version}-rc6; do \
+  install -p -m 755 $x/dynbinary/%{repo}-%{version}-rc6 %{buildroot}%{_bindir}/%{repo}
+  install -p -m 755 $x/dynbinary/%{repo}init-%{version}-rc6 %{buildroot}%{_libexecdir}/%{repo}/%{repo}init
   break
 done
 
@@ -475,6 +475,10 @@ fi
 %{_datadir}/zsh/site-functions/_%{repo}
 
 %changelog
+* Tue Apr 14 2015 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.6.0-0.2.rc6
+- build @rhatdan/fedora-1.6 commit#b27feb4
+- moved GOTRACEBACK=crash to unitfile
+
 * Mon Apr 06 2015 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.6.0-0.1.rc5
 - use 1.6.0-rc5
 
diff --git a/docker.sysconfig b/docker.sysconfig
index 64d45ee..3293997 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -20,6 +20,3 @@ DOCKER_CERT_PATH=/etc/docker
 # Controls the /etc/cron.daily/docker-logrotate cron job status.
 # To disable, uncomment the line below.
 # LOGROTATE=false
-
-# Allow creation of core dumps
-GOTRACEBACK=crash
diff --git a/sources b/sources
index 8a2c5b2..7746e5f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6f71c820cbae5f77ea5dbca2c123a22b  docker-fc4825d.tar.gz
+c77a091e7a7698cb8df837bfe8ee2d4f  docker-b27feb4.tar.gz
 267f404d7f1c83b26fe028ed76cb3607  docker-selinux-4421e0d.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/docker.git/commit/?h=f22&id=b0957fd78ee9aeea093dd4cec05008c96f327a0a