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 +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 + diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index d210940..ad0fdfa 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -40,10 +40,10 @@ License: GPLv3+ URL: http://www.freeipa.org/ Source0: http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz # RHEL spec file only: START: Change branding to IPA and Identity-Management -Source1: header-logo.png -Source2: login-screen-background.jpg -Source3: login-screen-logo.png -Source4: product-name.png +#Source1: header-logo.png +#Source2: login-screen-background.jpg +#Source3: login-screen-logo.png +#Source4: product-name.png # RHEL spec file only: END: Change branding to IPA and Identity-Management BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -292,9 +292,6 @@ Requires: selinux-policy >= %{selinux_policy_version} Requires(post): selinux-policy-base Requires: slapi-nis >= 0.54-2 Requires: pki-ca >= 10.1.2-5 -%if 0%{?rhel} -Requires: subscription-manager -%endif Requires(preun): python systemd-units Requires(postun): python systemd-units Requires: python-dns >= 1.11.1-2 @@ -307,7 +304,7 @@ Requires: fontawesome-fonts Requires: open-sans-fonts # RHEL spec file only: DELETED: Disable DNSSEC support # RHEL spec file only: START -Requires: redhat-access-plugin-ipa +# Requires: redhat-access-plugin-ipa # RHEL spec file only: END Conflicts: %{alt_name}-server @@ -481,10 +478,10 @@ for p in %patches ; do done # Red Hat's Identity Management branding -cp %SOURCE1 install/ui/images/header-logo.png -cp %SOURCE2 install/ui/images/login-screen-background.jpg -cp %SOURCE3 install/ui/images/login-screen-logo.png -cp %SOURCE4 install/ui/images/product-name.png +# cp %SOURCE1 install/ui/images/header-logo.png +# cp %SOURCE2 install/ui/images/login-screen-background.jpg +# cp %SOURCE3 install/ui/images/login-screen-logo.png +# cp %SOURCE4 install/ui/images/product-name.png # RHEL spec file only: END %build