Merge branch 'main' into fix/readme-docs-link

ROCm · Sep 13, 2024 · f875dac · f875dac
2 parents 001c566 + 1413ab6
commit f875dac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-* @jrmadsen
+* @jrmadsen @dgaliffiAMD
 
 # Documentation files
 docs/* @ROCm/rocm-documentation

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -395,6 +395,11 @@ install(
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}
     COMPONENT setup)
 
+install(
+    FILES ${PROJECT_SOURCE_DIR}/LICENSE
+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
+    COMPONENT setup)
+
 # ------------------------------------------------------------------------------#
 #
 # install

diff --git a/cmake/ConfigCPack.cmake b/cmake/ConfigCPack.cmake
@@ -214,6 +214,7 @@ set(CPACK_RPM_PACKAGE_PROVIDES
     "${CPACK_RPM_PACKAGE_PROVIDES}"
     CACHE STRING "RPM package provides" FORCE)
 
+set(CPACK_RPM_PACKAGE_LICENSE "MIT")
 set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
 set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)

diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt
@@ -31,7 +31,7 @@ click==8.1.7
     #   sphinx-external-toc
 click-log==0.4.0
     # via doxysphinx
-cryptography==42.0.8
+cryptography==43.0.1
     # via pyjwt
 deprecated==1.2.14
     # via pygithub