Skip to content

Commit

Permalink
Add Buildrequires for fontawesome
Browse files Browse the repository at this point in the history
This resolves a disparity in installed files between Maven and CMake now
that fontawesome is not bundled in the CMake build anymore. A symlink is
created in the cmake build to match what happens in Maven.
  • Loading branch information
ckelleyRH committed Sep 21, 2023
1 parent 6c01ba6 commit 3bc90a9
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
8 changes: 8 additions & 0 deletions base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,14 @@ find_file(IDM_CONSOLE_FRAMEWORK_JAR
/usr/share/java
)

find_file(FONTAWESOME_WEBFONT
NAMES
fontawesome-webfont.woff
PATHS
/usr/share/fonts/fontawesome/
/usr/share/fonts/fontawesome4/
)

add_subdirectory(common)
add_subdirectory(tools)

Expand Down
2 changes: 2 additions & 0 deletions pki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,10 @@ Obsoletes: %{product_id}-server-theme < %{version}-%{release}
Provides: %{product_id}-server-theme = %{version}-%{release}

%if 0%{?fedora} > 38
BuildRequires: fontawesome4-fonts-web
Requires: fontawesome4-fonts-web
%else
BuildRequires: fontawesome-fonts-web
Requires: fontawesome-fonts-web
%endif

Expand Down
9 changes: 9 additions & 0 deletions themes/dogtag/common-ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ add_custom_command(
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/ocsp links/
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/pki.properties links/pki.properties
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/tks links/
COMMAND ${CMAKE_COMMAND} -E make_directory fonts
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/fonts/fontawesome-webfont.woff fonts/fontawesome-webfont.woff
)

install(
Expand All @@ -24,6 +26,13 @@ install(
${DATA_INSTALL_DIR}/server/webapps/pki
)

install(
DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/fonts/
DESTINATION
${DATA_INSTALL_DIR}/common-ui/fonts
)

install(
DIRECTORY
shared/
Expand Down

0 comments on commit 3bc90a9

Please sign in to comment.