[rpms/rocm-rpp] rawhide: merge compat changes

[rpms/rocm-rpp] rawhide: merge compat changes

[Tom Rix]

            A new commit has been pushed.

            Repo   : rpms/rocm-rpp
            Branch : rawhide
            Commit : 4a05973942547c95d2f26990b447329893476973
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-06-20T08:21:45-07:00
            Stats  : +24/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/rocm-rpp/c/4a05973942547c95d2f26990b447329893476973?branch=rawhide

            Log:
            merge compat changes

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/rocm-rpp.spec b/rocm-rpp.spec
index c5da0d4..5c35db1 100644
--- a/rocm-rpp.spec
+++ b/rocm-rpp.spec
@@ -30,11 +30,13 @@
 %global pkg_prefix %{_prefix}/lib64/rocm/rocm-%{rocm_release}
 %global pkg_suffix %{rocm_release}
 %global pkg_module rocm%{pkg_suffix}
+%global skip_install_rpath OFF
 %else
 %global pkg_libdir %{_lib}
 %global pkg_prefix %{_prefix}
 %global pkg_suffix %{nil}
 %global pkg_module default
+%global skip_install_rpath ON
 %endif
 
 %global toolchain rocm
@@ -62,7 +64,7 @@
 
 Name:           rocm-rpp%{pkg_suffix}
 Version:        %{rocm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ROCm Performace Primatives for computer vision
 Url:            https://github.com/ROCm/%{upstreamname}
 License:        MIT AND Apache-2.0 AND LicenseRef-Fedora-Public-Domain
@@ -83,14 +85,21 @@ BuildRequires:  ninja-build
 %if 0%{?fedora}
 BuildRequires:  opencv-devel
 %endif
+BuildRequires:  patchelf
 BuildRequires:  rocm-cmake%{pkg_suffix}
 BuildRequires:  rocm-comgr%{pkg_suffix}-devel
 BuildRequires:  rocm-compilersupport%{pkg_suffix}-macros
+BuildRequires:  rocm-filesystem%{pkg_suffix}
 BuildRequires:  rocm-omp%{pkg_suffix}-devel
 BuildRequires:  rocm-hip%{pkg_suffix}-devel
 BuildRequires:  rocm-runtime%{pkg_suffix}-devel
 BuildRequires:  rocm-rpm-macros%{pkg_suffix}
 
+Requires:       rocm-filesystem%{pkg_suffix}
+Requires:       rocm-hip%{pkg_suffix}
+Requires:       rocm-omp%{pkg_suffix}-devel
+Requires:       rocm-runtime%{pkg_suffix}
+
 # Only x86_64 works right now:
 ExclusiveArch:  x86_64
 
@@ -102,6 +111,7 @@ have HIP, OpenCL, or CPU backends.
 %package devel
 Summary:        Libraries and headers for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       rocm-filesystem%{pkg_suffix}
 
 %description devel
 %{summary}
@@ -110,6 +120,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %package test
 Summary:        Tests for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       rocm-filesystem%{pkg_suffix}
 
 %description test
 %{summary}
@@ -156,8 +167,11 @@ sed -i -e 's|@PACKAGE_LIB_INSTALL_DIR@|%{pkg_prefix}/%{pkg_libdir}|' cmake_modul
     -G Ninja \
     -DCMAKE_C_COMPILER=%rocmllvm_bindir/amdclang \
     -DCMAKE_CXX_COMPILER=%rocmllvm_bindir/amdclang++ \
-    -DCMAKE_INSTALL_LIBDIR=%{pkg_libdir} \
+    -DCMAKE_INSTALL_LIBDIR=%{pkg_prefix}/%{pkg_libdir} \
     -DCMAKE_INSTALL_PREFIX=%{pkg_prefix} \
+    -DCMAKE_INSTALL_RPATH=%{pkg_prefix}/%{pkg_libdir} \
+    -DCMAKE_SKIP_RPATH=%{skip_install_rpath} \
+    -DCMAKE_SKIP_INSTALL_RPATH=%{skip_install_rpath} \
     -DGPU_TARGETS=%{gpu_list} \
     -DBACKEND=HIP \
     -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \
@@ -167,15 +181,19 @@ sed -i -e 's|@PACKAGE_LIB_INSTALL_DIR@|%{pkg_prefix}/%{pkg_libdir}|' cmake_modul
     -DRPP_AUDIO_SUPPORT=OFF \
     -DROCM_PATH=%{pkg_prefix} \
     -DHIP_PATH=%{pkg_prefix} \
-    -DCMAKE_INSTALL_LIBDIR=%{pkg_prefix}/%{pkg_libdir}
+
 
 %cmake_build
 
 %install
 %cmake_install
 
+%if %{without compat}
 # ERROR   0020: file '/usr/lib64/librpp.so.1.9.1' contains a runpath referencing '..' of an absolute path [/usr/lib64/rocm/llvm/bin/../lib]
 chrpath -r %{rocmllvm_libdir} %{buildroot}%{pkg_prefix}/%{pkg_libdir}/librpp.so.2.*.*
+%else
+patchelf --add-rpath %{pkg_prefix}/%{pkg_libdir} %{buildroot}%{pkg_prefix}/%{pkg_libdir}/librpp.so.2.*.*
+%endif
 
 # Extra licenses
 rm -f %{buildroot}%{pkg_prefix}/share/doc/rpp-asan/FFTS_LICENSE
@@ -199,6 +217,9 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/rpp/LICENSE
 %endif
 
 %changelog
+* Sat Jun 20 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.1-2
+- merge compat changes
+
 * Tue Mar 24 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.1-1
 - Update to 7.2.1