From d6d60529ce2f94102bc11ed29e2b53ddcf766920 Mon Sep 17 00:00:00 2001
From: nelsonc-amd <44706806+nelsonc-amd@users.noreply.github.com>
Date: Thu, 19 Mar 2020 03:45:09 -0700
Subject: [PATCH] packaging: change Provides to use dash instead of underscore
 (#1913)

Addresses an installation problem for several HIP packages.
Packages builds have been tested locally, validation in progress.

[ROCm/hip commit: b757c2a891e03a7a2d3fe9ff25f5460c158fbdcb]
---
 projects/hip/packaging/hip-base.txt    | 3 +--
 projects/hip/packaging/hip-doc.txt     | 3 +--
 projects/hip/packaging/hip-hcc.txt     | 3 +--
 projects/hip/packaging/hip-nvcc.txt    | 3 +--
 projects/hip/packaging/hip-samples.txt | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/projects/hip/packaging/hip-base.txt b/projects/hip/packaging/hip-base.txt
index 221ff98608..fc8becf84f 100644
--- a/projects/hip/packaging/hip-base.txt
+++ b/projects/hip/packaging/hip-base.txt
@@ -26,9 +26,8 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0)")
-set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_base")
+set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-base")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_base")
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_base")
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst")
diff --git a/projects/hip/packaging/hip-doc.txt b/projects/hip/packaging/hip-doc.txt
index d97ddc7d3a..41db246d31 100644
--- a/projects/hip/packaging/hip-doc.txt
+++ b/projects/hip/packaging/hip-doc.txt
@@ -32,9 +32,8 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}
 set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION})")
-set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_doc")
+set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-doc")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_doc")
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_doc")
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
diff --git a/projects/hip/packaging/hip-hcc.txt b/projects/hip/packaging/hip-hcc.txt
index 21e138e1ed..6a04ebffbd 100644
--- a/projects/hip/packaging/hip-hcc.txt
+++ b/projects/hip/packaging/hip-hcc.txt
@@ -37,9 +37,8 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@), comgr (>= 1.1)")
-set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_hcc")
+set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-hcc")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_hcc")
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_hcc")
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst")
diff --git a/projects/hip/packaging/hip-nvcc.txt b/projects/hip/packaging/hip-nvcc.txt
index dc36b628c7..4b11939609 100644
--- a/projects/hip/packaging/hip-nvcc.txt
+++ b/projects/hip/packaging/hip-nvcc.txt
@@ -19,9 +19,8 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), cuda (>= 7.5)")
-set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_nvcc")
+set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-nvcc")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_nvcc")
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_nvcc")
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst")
diff --git a/projects/hip/packaging/hip-samples.txt b/projects/hip/packaging/hip-samples.txt
index aa8ff42821..b3d8bfa807 100644
--- a/projects/hip/packaging/hip-samples.txt
+++ b/projects/hip/packaging/hip-samples.txt
@@ -20,9 +20,8 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}
 set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION})")
-set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_samples")
+set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-samples")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_samples")
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_samples")
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")