diff --git a/pki.spec b/pki.spec index 97491b49639..d1c98934cd4 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: GPL-2.0-only and LGPL-2.0-only +License: GPLv2 and LGPLv2 Version: %{major_version}.%{minor_version}.%{update_version} Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} @@ -59,12 +59,6 @@ ExcludeArch: i686 %global p11_kit_trust /usr/lib64/pkcs11/p11-kit-trust.so -################################################################################ -# Python -################################################################################ - -%global python_executable /usr/bin/python3 - ################################################################################ # Java ################################################################################ @@ -759,12 +753,6 @@ 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} @@ -902,16 +890,6 @@ 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