From 7f25939b507d46e5f61aeafda240961d8927fd49 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 29 Mar 2023 13:56:00 -0400
Subject: [PATCH] More v8-devel fixes

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 nodejs20.spec            | 19 +++++++++----------
 packaging/nodejs.spec.j2 | 19 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/nodejs20.spec b/nodejs20.spec
index 582c9b1..9f963d8 100644
--- a/nodejs20.spec
+++ b/nodejs20.spec
@@ -592,10 +592,12 @@ done
 ln -s ./node/cppgc %{buildroot}%{_includedir}/cppgc
 
 for soname in libv8 libv8_libbase libv8_libplatform; do
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so.%{v8_major}
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major}
+  ln -srf %{buildroot}%{_libdir}/libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major}.%{v8_minor}
+  ln -srf %{buildroot}%{_libdir}/libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so
+
+  %if 0%{?nodejs_default}
+    ln -srf %{buildroot}%{_libdir}/libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major}
+  %endif
 done
 
 # install documentation
@@ -773,9 +775,9 @@ end
 %files -n %{pkgname}-libs
 %license LICENSE
 %{_libdir}/libnode.so.%{nodejs_soversion}
-%{_libdir}/%{pkgname}-libv8.so.%{v8_major}
-%{_libdir}/%{pkgname}-libv8_libbase.so.%{v8_major}
-%{_libdir}/%{pkgname}-libv8_libplatform.so.%{v8_major}
+%{_libdir}/libv8.so.%{v8_major}.%{v8_minor}
+%{_libdir}/libv8_libbase.so.%{v8_major}.%{v8_minor}
+%{_libdir}/libv8_libplatform.so.%{v8_major}.%{v8_minor}
 %dir %{nodejs_datadir}/
 %if 0%{?nodejs_default}
 %{_libdir}/libv8.so.%{v8_major}
@@ -787,9 +789,6 @@ end
 %{_includedir}/libplatform
 %{_includedir}/v8*.h
 %{_includedir}/cppgc
-%{_libdir}/%{pkgname}-libv8.so
-%{_libdir}/%{pkgname}-libv8_libbase.so
-%{_libdir}/%{pkgname}-libv8_libplatform.so
 %{_libdir}/libv8.so
 %{_libdir}/libv8_libbase.so
 %{_libdir}/libv8_libplatform.so
diff --git a/packaging/nodejs.spec.j2 b/packaging/nodejs.spec.j2
index 9b4b358..fc44075 100644
--- a/packaging/nodejs.spec.j2
+++ b/packaging/nodejs.spec.j2
@@ -604,10 +604,12 @@ done
 ln -s ./node/cppgc %{buildroot}%{_includedir}/cppgc
 
 for soname in libv8 libv8_libbase libv8_libplatform; do
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so.%{v8_major}
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so
-    ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major}
+  ln -srf %{buildroot}%{_libdir}/libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major}.%{v8_minor}
+  ln -srf %{buildroot}%{_libdir}/libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so
+
+  %if 0%{?nodejs_default}
+    ln -srf %{buildroot}%{_libdir}/libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major}
+  %endif
 done
 
 # install documentation
@@ -791,9 +793,9 @@ end
 %files -n %{pkgname}-libs
 %license LICENSE
 %{_libdir}/libnode.so.%{nodejs_soversion}
-%{_libdir}/%{pkgname}-libv8.so.%{v8_major}
-%{_libdir}/%{pkgname}-libv8_libbase.so.%{v8_major}
-%{_libdir}/%{pkgname}-libv8_libplatform.so.%{v8_major}
+%{_libdir}/libv8.so.%{v8_major}.%{v8_minor}
+%{_libdir}/libv8_libbase.so.%{v8_major}.%{v8_minor}
+%{_libdir}/libv8_libplatform.so.%{v8_major}.%{v8_minor}
 %dir %{nodejs_datadir}/
 %if 0%{?nodejs_default}
 %{_libdir}/libv8.so.%{v8_major}
@@ -805,9 +807,6 @@ end
 %{_includedir}/libplatform
 %{_includedir}/v8*.h
 %{_includedir}/cppgc
-%{_libdir}/%{pkgname}-libv8.so
-%{_libdir}/%{pkgname}-libv8_libbase.so
-%{_libdir}/%{pkgname}-libv8_libplatform.so
 %{_libdir}/libv8.so
 %{_libdir}/libv8_libbase.so
 %{_libdir}/libv8_libplatform.so