From 10ca379c344d7db7f12ddbdc203d0ff71c323b32 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jun 26 2014 12:39:25 +0000 Subject: update for centos branding --- 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 13a4ac1..e035509 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -102,6 +102,8 @@ 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 +Patch9999: ipa-centos-branding.patch + %if ! %{ONLY_CLIENT} BuildRequires: 389-ds-base-devel >= 1.3.1 BuildRequires: svrcore-devel @@ -844,6 +846,9 @@ fi %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt %changelog +* Thu Jun 26 2014 Johnny Hughes - 3.3.3-28.el7.centos +- Roll in CentOS Branding + * Tue Apr 1 2014 Martin Kosek - 3.3.3-28 - ipa-client-automount fails with incompatibility error when installed against older IPA server (#1083108)