From b132798c53c3ebe5544790053b59af19529307c1 Mon Sep 17 00:00:00 2001
From: Karanbir Singh <kbsingh@karan.org>
Date: Jun 17 2015 13:51:07 +0000
Subject: merge back changes needed to match centos-atomic-host branding with anaconda


---

diff --git a/SOURCES/centos-atomic-host.conf b/SOURCES/centos-atomic-host.conf
new file mode 100644
index 0000000..1baac94
--- /dev/null
+++ b/SOURCES/centos-atomic-host.conf
@@ -0,0 +1,4 @@
+[remote "centos-atomic-host"]
+url=http://mirror.centos.org/centos/7/atomic/x86_64/repo
+branches=centos-atomic-host/7/x86_64/standard;
+gpg-verify=true
diff --git a/SOURCES/centos-atomic.conf b/SOURCES/centos-atomic.conf
deleted file mode 100644
index 1baac94..0000000
--- a/SOURCES/centos-atomic.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[remote "centos-atomic-host"]
-url=http://mirror.centos.org/centos/7/atomic/x86_64/repo
-branches=centos-atomic-host/7/x86_64/standard;
-gpg-verify=true
diff --git a/SPECS/centos-release-atomic.spec b/SPECS/centos-release-atomic.spec
index cc13c9a..c3de0fe 100644
--- a/SPECS/centos-release-atomic.spec
+++ b/SPECS/centos-release-atomic.spec
@@ -2,10 +2,10 @@ Summary: CentOS Atomic Host metadata and configs
 Name: centos-release-atomic
 Epoch: 0
 Version: 7
-Release: 1.2%{?dist}
+Release: 1.2%{?dist}.1
 License: GPL
 Group: System Environment/Base
-Source0: centos-atomic.conf
+Source0: centos-atomic-host.conf
 Source1: RPM-GPG-KEY-CentOS-SIG-Atomic
 
 URL: http://wiki.centos.org/SpecialInterestGroup/Atomic
@@ -41,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /usr/share/ostree/trusted.gpg.d/*
 
 %changelog
+* Mon Jun 15 2015 Colin Walters <walters@redhat.com> - 0:7-1.2.1
+- Use centos-atomic-host consistently; the installer OS name and remote
+  include the "-host" suffix, which we should be using too.
+
 * Wed Jun 10 2015 Karanbir Singh <kbsingh@centos.org> - 7-1.2.el7.centos
 - Add gpg keys
 - rework the remote urls to point at final destination