From 73692074cf0ceff05d58338702fd3c678c431441 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 28 2017 19:02:44 +0000
Subject: import atomic-devmode-0.3.7-1.el7


---

diff --git a/.atomic-devmode.metadata b/.atomic-devmode.metadata
index c1fcf67..deffa81 100644
--- a/.atomic-devmode.metadata
+++ b/.atomic-devmode.metadata
@@ -1 +1 @@
-100011d89d028f41687595a8384a7eff6f3f2dd2 SOURCES/atomic-devmode-v0.3.6.tar.gz
+44ad717741183a5784b61613eaabcd22d5122868 SOURCES/atomic-devmode-v0.3.7.tar.gz
diff --git a/.gitignore b/.gitignore
index 83c6927..4c72cf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/atomic-devmode-v0.3.6.tar.gz
+SOURCES/atomic-devmode-v0.3.7.tar.gz
diff --git a/SOURCES/0001-init-pull-cockpit-from-the-rhel7-registry.patch b/SOURCES/0001-init-pull-cockpit-from-the-rhel7-registry.patch
index 26c85f9..b447256 100644
--- a/SOURCES/0001-init-pull-cockpit-from-the-rhel7-registry.patch
+++ b/SOURCES/0001-init-pull-cockpit-from-the-rhel7-registry.patch
@@ -4,22 +4,24 @@ Date: Tue, 3 May 2016 11:09:12 -0400
 Subject: [PATCH] init: pull cockpit from the rhel7 registry
 
 ---
- libexec/init | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ libexec/init | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libexec/init b/libexec/init
-index 8e7b425..f8793e8 100755
+index 5f2f115..066117f 100755
 --- a/libexec/init
 +++ b/libexec/init
-@@ -140,7 +140,7 @@ bottom_pane() {
+@@ -144,8 +144,8 @@ bottom_pane() {
  	fi
  
  	rc=0
--	atomic run cockpit/ws || rc=$?
-+	atomic run registry.access.redhat.com/rhel7/cockpit-ws || rc=$?
+-	(atomic install cockpit/ws &&
+-	 atomic run cockpit/ws) || rc=$?
++	(atomic install registry.access.redhat.com/rhel7/cockpit-ws &&
++	 atomic run registry.access.redhat.com/rhel7/cockpit-ws) || rc=$?
  	echo $rc > /run/atomic-devmode-cockpit.rc
  	journalctl -f
  }
 -- 
-2.5.0
+2.13.0
 
diff --git a/SPECS/atomic-devmode.spec b/SPECS/atomic-devmode.spec
index 903139b..f5009b2 100644
--- a/SPECS/atomic-devmode.spec
+++ b/SPECS/atomic-devmode.spec
@@ -1,6 +1,6 @@
 Name: atomic-devmode
-Version: 0.3.6
-Release: 2%{?dist}
+Version: 0.3.7
+Release: 1%{?dist}
 Summary: Atomic Developer Mode
 
 License: LGPLv3+
@@ -52,6 +52,16 @@ make install DESTDIR="%{buildroot}"
 %license COPYING COPYING.LESSER
 
 %changelog
+* Thu Jun 01 2017 Jonathan Lebon <jlebon@redhat.com> - 0.3.7-1
+- New upstream release containing backported patch
+- Drop patch that works around non-existent Cockpit regression
+
+* Tue May 23 2017 Jonathan Lebon <jlebon@redhat.com> - 0.3.6-3
+- Backport patch to install before running cockpit:
+  https://github.com/projectatomic/atomic-devmode/pull/10
+- Add patch to work around
+  https://bugzilla.redhat.com/show_bug.cgi?id=1454882
+
 * Mon Mar 20 2017 Jonathan Lebon <jlebon@redhat.com> - 0.3.6-2
 - Put back patch for pulling cockpit from RHEL registry