From f1d1dc927fbf74634b92a944bba2a31bf9aaccd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 11:04:24 -0600
Subject: [PATCH 1/3] Bump rocm-docs-core from 1.4.0 to 1.6.2 in /docs (#220)

Bumps [rocm-docs-core](https://github.com/ROCm/rocm-docs-core) from 1.4.0 to 1.6.2.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/v1.6.2/CHANGELOG.md)
- [Commits](https://github.com/ROCm/rocm-docs-core/compare/v1.4.0...v1.6.2)

---
updated-dependencies:
- dependency-name: rocm-docs-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/requirements.in  | 2 +-
 docs/requirements.txt | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/requirements.in b/docs/requirements.in
index 480de5db..09a5a3a8 100644
--- a/docs/requirements.in
+++ b/docs/requirements.in
@@ -1,2 +1,2 @@
 sphinxcontrib-moderncmakedomain==3.29.0
-rocm-docs-core==1.4.0
+rocm-docs-core==1.6.2
diff --git a/docs/requirements.txt b/docs/requirements.txt
index cf77425a..9747429e 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -92,7 +92,7 @@ requests==2.32.3
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==1.4.0
+rocm-docs-core==1.6.2
     # via -r requirements.in
 smmap==5.0.1
     # via gitdb
@@ -136,8 +136,6 @@ sphinxcontrib-qthelp==1.0.7
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
-tomli==2.0.1
-    # via sphinx
 typing-extensions==4.12.2
     # via
     #   pydata-sphinx-theme

From e494a5096d0d3f8da3fe14a42e8c2a0df185db4e Mon Sep 17 00:00:00 2001
From: Joseph Macaranas <145489236+amd-jmacaran@users.noreply.github.com>
Date: Wed, 14 Aug 2024 01:36:52 -0400
Subject: [PATCH 2/3] External CI: Add triggers for mainline branch (#211)

---
 .azuredevops/rocm-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.azuredevops/rocm-ci.yml b/.azuredevops/rocm-ci.yml
index 096c97c3..0e26f7df 100644
--- a/.azuredevops/rocm-ci.yml
+++ b/.azuredevops/rocm-ci.yml
@@ -14,6 +14,7 @@ trigger:
   branches:
     include:
     - develop
+    - mainline
   paths:
     exclude:
     - .github
@@ -26,6 +27,7 @@ pr:
   branches:
     include:
     - develop
+    - mainline
   paths:
     exclude:
     - .github

From 5c11142c8a4f366a3cf3f9368ce6bbd7070bf404 Mon Sep 17 00:00:00 2001
From: Lauren Wrubleski <Lauren.Wrubleski@amd.com>
Date: Thu, 29 Aug 2024 15:54:20 -0600
Subject: [PATCH 3/3] Header-only devel package PROVIDES field fixes (#170)

* Fix provides field

Previously the code for provides field was not evaluating the CPACK_DEBIAN_PACKAGE_PROVIDES variable, causing CPACK_DEBIAN_PACKAGE_PROVIDES to be included as a literal string provided by the devel package.

* Correct debian/rpm

* Fix misplaced comma

* Remove version from RPM provides field

---------

Co-authored-by: Eiden Yoshida <47196116+eidenyoshida@users.noreply.github.com>
(cherry picked from commit d27d809ddbb8ced17d7a07a0b0c7db5d74c9af8f)
---
 .../cmake/ROCMCreatePackage.cmake             | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
index 1cab2d8d..a2de88c7 100755
--- a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
+++ b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
@@ -336,14 +336,29 @@ macro(rocm_create_package)
             )
         endif()
         if(PARSE_HEADER_ONLY OR NOT BUILD_SHARED_LIBS)
-            rocm_join_if_set(", "
-                CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
-                CPACK_DEBIAN_PACKAGE_PROVIDES
-                "${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
-            rocm_join_if_set(", "
-                CPACK_RPM_DEVEL_PACKAGE_PROVIDES
-                CPACK_DEBIAN_PACKAGE_PROVIDES
-                "${CPACK_PACKAGE_NAME} = ${CPACK_PACKAGE_VERSION}")
+            if(DEFINED CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES)
+                rocm_join_if_set(", "
+                    CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})"
+                )
+            else()
+                rocm_join_if_set(", "
+                    CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_DEBIAN_PACKAGE_PROVIDES}"
+                    "${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
+            endif()
+
+            if(DEFINED CPACK_RPM_DEVEL_PACKAGE_PROVIDES)
+                rocm_join_if_set(", "
+                    CPACK_RPM_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_PACKAGE_NAME}"
+                )
+            else()
+                rocm_join_if_set(", "
+                    CPACK_RPM_DEVEL_PACKAGE_PROVIDES
+                    "${CPACK_RPM_PACKAGE_PROVIDES}"
+                    "${CPACK_PACKAGE_NAME}")
+            endif()
         else()
             rocm_package_add_dependencies(COMPONENT devel DEPENDS "${CPACK_PACKAGE_NAME} >= ${CPACK_PACKAGE_VERSION}")
         endif()