From dd5fa649450744885f89d948437df4bdf84be310 Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Mar 11 2015 15:42:02 +0000
Subject: update debrand patch. no spec change, as none required


---

diff --git a/SOURCES/ipa-centos-branding.patch b/SOURCES/ipa-centos-branding.patch
index 33b4609..673cd2f 100644
--- a/SOURCES/ipa-centos-branding.patch
+++ b/SOURCES/ipa-centos-branding.patch
@@ -1,12 +1,38 @@
-diff -uNrp freeipa-3.3.3.orig/ipaserver/install/ntpinstance.py freeipa-3.3.3/ipaserver/install/ntpinstance.py
---- freeipa-3.3.3.orig/ipaserver/install/ntpinstance.py	2013-11-01 10:34:30.000000000 -0500
-+++ freeipa-3.3.3/ipaserver/install/ntpinstance.py	2014-06-26 07:27:19.644718099 -0500
-@@ -43,6 +43,8 @@ class NTPInstance(service.Service):
+From 99efecaf87dc1fc9517efaff441a6a7ce46444eb Mon Sep 17 00:00:00 2001
+From: Jim Perrin <jperrin@centos.org>
+Date: Wed, 11 Mar 2015 10:37:03 -0500
+Subject: [PATCH] update for new ntp server method
+
+---
+ ipaplatform/base/paths.py        | 1 +
+ ipaserver/install/ntpinstance.py | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
+index af50262..5090062 100644
+--- a/ipaplatform/base/paths.py
++++ b/ipaplatform/base/paths.py
+@@ -99,6 +99,7 @@ class BasePathNamespace(object):
+     PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/"
+     PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf"
+     ETC_REDHAT_RELEASE = "/etc/redhat-release"
++    ETC_CENTOS_RELEASE = "/etc/centos-release"
+     RESOLV_CONF = "/etc/resolv.conf"
+     SAMBA_KEYTAB = "/etc/samba/samba.keytab"
+     SMB_CONF = "/etc/samba/smb.conf"
+diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
+index c653525..4b0578b 100644
+--- a/ipaserver/install/ntpinstance.py
++++ b/ipaserver/install/ntpinstance.py
+@@ -44,6 +44,8 @@ class NTPInstance(service.Service):
          os = ""
-         if ipautil.file_exists("/etc/fedora-release"):
+         if ipautil.file_exists(paths.ETC_FEDORA_RELEASE):
              os = "fedora"
-+        elif ipautil.file_exists("/etc/centos-release"):
++        elif ipautil.file_exists(paths.ETC_CENTOS_RELEASE):
 +            os = "centos"
-         elif ipautil.file_exists("/etc/redhat-release"):
+         elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE):
              os = "rhel"
  
+-- 
+1.8.3.1
+