From 94475fdcf3ba2f1ab82fcc18a6838bb7dd1eb84f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 27 Feb 2023 14:16:48 -0700 Subject: [PATCH] Unbundle the FontAwesome font --- dogtag-pki.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dogtag-pki.spec b/dogtag-pki.spec index cfd0db5..8d0caf3 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -14,7 +14,7 @@ Name: dogtag-pki # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 1 +%global release_number 2 # Development phase: # - development (unsupported): alpha where n >= 1 @@ -752,6 +752,12 @@ Provides: pki-server-theme = %{version}-%{release} Obsoletes: %{product_id}-server-theme < %{version}-%{release} Provides: %{product_id}-server-theme = %{version}-%{release} +%if 0%{?fedora} > 38 +Requires: fontawesome4-fonts-web +%else +Requires: fontawesome-fonts-web +%endif + # Ensure we end up with a useful installation Conflicts: pki-base < %{version} Conflicts: pki-javadoc < %{version} @@ -867,6 +873,16 @@ pkgs=base\ --install-dir=%{buildroot} \ install +# Unbundle the FontAwesome fonts +rm %{buildroot}%{_datadir}/pki/common-ui/fonts/fontawesome-webfont.woff +%if 0%{?fedora} > 38 +ln -s ../../../fonts/fontawesome4/fontawesome-webfont.woff \ + %{buildroot}%{_datadir}/pki/common-ui/fonts/fontawesome-webfont.woff +%else +ln -s ../../../fonts/fontawesome/fontawesome-webfont.woff \ + %{buildroot}%{_datadir}/pki/common-ui/fonts/fontawesome-webfont.woff +%endif + %if %{with server} %pre -n %{product_id}-server @@ -1274,6 +1290,9 @@ fi ################################################################################ %changelog +* Mon Feb 27 2023 Jerry James - 11.3.1-2 +- Unbundle the FontAwesome font + * Tue Feb 07 2023 Dogtag PKI Team - 11.3.1-1 - Rebase to PKI 11.3.1