Skip to content

Commit

Permalink
Revert "Upstream some spec file changes from Fedora"
Browse files Browse the repository at this point in the history
This reverts commit 56efe4a.
  • Loading branch information
ckelleyRH committed Jun 20, 2023
1 parent 2248738 commit b0d00db
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions pki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -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
################################################################################
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b0d00db

Please sign in to comment.