From be564e23eb8333c9b9b9dc6a0fc9124e3efd2d4e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 1 May 2019 16:29:01 -0700 Subject: [PATCH] Backport PR #3104 to fix a font path error --- ...-fontawesome-path-broken-by-da2cf1c5.patch | 30 +++++++++++++++++++ freeipa.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-Correct-default-fontawesome-path-broken-by-da2cf1c5.patch diff --git a/0001-Correct-default-fontawesome-path-broken-by-da2cf1c5.patch b/0001-Correct-default-fontawesome-path-broken-by-da2cf1c5.patch new file mode 100644 index 0000000..5d479d6 --- /dev/null +++ b/0001-Correct-default-fontawesome-path-broken-by-da2cf1c5.patch @@ -0,0 +1,30 @@ +From 486ba017ceab1fb240f2fc48fea6169bc8c97319 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 1 May 2019 16:19:53 -0700 +Subject: [PATCH] Correct default fontawesome path (broken by da2cf1c5) + +On Fedora/RHEL, it does not have a dash in it. The changes in +da2cf1c5 inadvertently added a dash to the path in the 'base' +paths definition (used on Fedora/RHEL), so the font wasn't found. + +Signed-off-by: Adam Williamson +--- + ipaplatform/base/paths.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py +index 1cd2591bc..e1d396690 100644 +--- a/ipaplatform/base/paths.py ++++ b/ipaplatform/base/paths.py +@@ -249,7 +249,7 @@ class BasePathNamespace: + USERADD = "/usr/sbin/useradd" + FONTS_DIR = "/usr/share/fonts" + FONTS_OPENSANS_DIR = "/usr/share/fonts/open-sans" +- FONTS_FONTAWESOME_DIR = "/usr/share/fonts/font-awesome" ++ FONTS_FONTAWESOME_DIR = "/usr/share/fonts/fontawesome" + USR_SHARE_IPA_DIR = "/usr/share/ipa/" + USR_SHARE_IPA_CLIENT_DIR = "/usr/share/ipa/client" + CA_TOPOLOGY_ULDIF = "/usr/share/ipa/ca-topology.uldif" +-- +2.21.0 + diff --git a/freeipa.spec b/freeipa.spec index 20eef8b..df24905 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -135,7 +135,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Identity, Policy and Audit system License: GPLv3+ @@ -143,6 +143,9 @@ URL: http://www.freeipa.org/ Source0: https://releases.pagure.org/freeipa/freeipa-%{version}.tar.gz Source1: https://releases.pagure.org/freeipa/freeipa-%{version}.tar.gz.asc Patch0001: 0001-revert-minssf-defaults.patch +# https://github.com/freeipa/freeipa/pull/3104 +# Fix an error in the path the webUI uses for fontawesome +Patch0002: 0001-Correct-default-fontawesome-path-broken-by-da2cf1c5.patch # For the timestamp trick in patch application BuildRequires: diffstat @@ -1307,6 +1310,9 @@ fi %changelog +* Wed May 1 2019 Adam Williamson - 4.7.90.pre1-3 +- Backport PR #3104 to fix a font path error + * Wed May 1 2019 Alexander Bokovoy - 4.7.90.pre1-2 - Revert MINSSF defaults because realmd cannot join FreeIPA right now as it uses anonymous LDAP connection for the discovery and validation