From 599353a4d3dfefc112b74f9b0fc9146228b02c9b Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Fri, 10 Mar 2023 08:20:10 +0100
Subject: [PATCH] Remove the deprecated "hip" directory

---
 rocm.spec | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/rocm.spec b/rocm.spec
index 6b7a95ef363..60b217ebd03 100644
--- a/rocm.spec
+++ b/rocm.spec
@@ -43,17 +43,22 @@ mv opt/rocm-%{realversion} %{i}
 rm -rf opt
 rm -rf usr
 
+# the hip directory is deprecated in favour of the main directory
+rm -r -f %{i}/hip/
+
 # hip-devel postinstall
 ln -s -f amd_detail    %{i}/include/hip/hcc_detail
 ln -s -f nvidia_detail %{i}/include/hip/nvcc_detail
-ln -s -f amd_detail    %{i}/hip/include/hip/hcc_detail
-ln -s -f nvidia_detail %{i}/hip/include/hip/nvcc_detail
+# deprecated
+#ln -s -f amd_detail    %{i}/hip/include/hip/hcc_detail
+#ln -s -f nvidia_detail %{i}/hip/include/hip/nvcc_detail
 
 # hip-runtime-amd postinstall
-mkdir -p %{i}/hip/lib/cmake/hip
-mkdir -p %{i}/hip/lib/cmake/hip-lang
-ln -r -s -f %{i}/lib/cmake/hip/hip-targets*           %{i}/hip/lib/cmake/hip/
-ln -r -s -f %{i}/lib/cmake/hip-lang/hip-lang-targets* %{i}/hip/lib/cmake/hip-lang/
+# deprecated
+#mkdir -p %{i}/hip/lib/cmake/hip
+#mkdir -p %{i}/hip/lib/cmake/hip-lang
+#ln -r -s -f %{i}/lib/cmake/hip/hip-targets*           %{i}/hip/lib/cmake/hip/
+#ln -r -s -f %{i}/lib/cmake/hip-lang/hip-lang-targets* %{i}/hip/lib/cmake/hip-lang/
 
 # rocm-llvm postinstall
 mkdir -p %{i}/bin