From 6d550ab64d6b1d06b799eb70b6945cc69e1e4466 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Mon, 19 Jun 2023 09:42:57 +0100
Subject: [PATCH] Upstream some spec file changes from Fedora

---
 pki.spec | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/pki.spec b/pki.spec
index 16b6d10389b..379a20ef7b7 100644
--- a/pki.spec
+++ b/pki.spec
@@ -28,7 +28,7 @@ Name:             pki
 Summary:          %{product_name} Package
 URL:              https://www.dogtagpki.org
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
-License:          GPLv2 and LGPLv2
+License:          GPL-2.0-only and LGPL-2.0-only
 Version:          %{major_version}.%{minor_version}.%{update_version}
 Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
@@ -59,6 +59,12 @@ ExcludeArch: i686
 
 %global p11_kit_trust /usr/lib64/pkcs11/p11-kit-trust.so
 
+################################################################################
+# Python
+################################################################################
+
+%global python_executable /usr/bin/python3
+
 ################################################################################
 # Java
 ################################################################################
@@ -753,6 +759,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}
@@ -890,6 +902,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