From 69f9f3454df6eac56e77a3041fbfc161d92d4f66 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 10 2014 08:59:30 +0000 Subject: debrand ipa-3.3.3-28.el7_0.3 --- diff --git a/SOURCES/ipa-centos-branding.patch b/SOURCES/ipa-centos-branding.patch new file mode 100644 index 0000000..33b4609 --- /dev/null +++ b/SOURCES/ipa-centos-branding.patch @@ -0,0 +1,12 @@ +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): + os = "" + if ipautil.file_exists("/etc/fedora-release"): + os = "fedora" ++ elif ipautil.file_exists("/etc/centos-release"): ++ os = "centos" + elif ipautil.file_exists("/etc/redhat-release"): + os = "rhel" + diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index b732bd2..8e486bf 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -107,6 +107,7 @@ Patch1004: 1004-Change-branding-to-IPA-and-Identity-Management.patch Patch1005: 1005-Remove-pylint-from-build-process.patch Patch1006: 1006-Remove-i18test-from-build-process.patch Patch1007: 1007-Remove-ipa-backup-and-ipa-restore-functionality.patch +Patch1008: ipa-centos-branding.patch %if ! %{ONLY_CLIENT} BuildRequires: 389-ds-base-devel >= 1.3.1 @@ -851,6 +852,9 @@ fi %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt %changelog +* Mon Nov 10 2014 CentOS Sources - 3.3.3-28.el7.centos.3 +- Roll in CentOS Branding + * Fri Sep 19 2014 Jan Cholasta - 3.3.3-28.3 - Add one missing patch for #1144031