Accepting request 1061192 from home:eeich:branches:science

- Make library links in the alternatives directory arch dependent.
  This avoids conflicts when both 32-bit and 64-bit versions are
  installed (boo#1207563).

OBS-URL: https://build.opensuse.org/request/show/1061192
OBS-URL: https://build.opensuse.org/package/show/science/lapack?expand=0&rev=30

lapack-man.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lapack-man
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

lapack.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 25 20:47:53 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Make library links in the alternatives directory arch dependent.
+  This avoids conflicts when both 32-bit and 64-bit versions are
+  installed (boo#1207563).
+
 -------------------------------------------------------------------
 Tue Mar 15 14:20:50 UTC 2022 - Egbert Eich <eich@suse.com>
 

lapack.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lapack
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -290,7 +290,7 @@ install -m 755 libblas.so.%{version} %{buildroot}/%{_libdir}/blas
 ln -s libblas.so.%{version} %{buildroot}/%{_libdir}/blas/libblas.so.3
 ln -s blas/libblas.so.%{version} %{buildroot}/%{_libdir}/libblas.so
 # dummy target for update-alternatives
-ln -s %{_sysconfdir}/alternatives/libblas.so.3 %{buildroot}/%{_libdir}/libblas.so.3
+ln -s %{_sysconfdir}/alternatives/libblas.so.3_%{_arch}  %{buildroot}/%{_libdir}/libblas.so.3
 ## CBLAS
 install -m 644 CBLAS/include/*.h %{buildroot}/%{_includedir}
 install -m 644 libcblas.a %{buildroot}/%{_libdir}
@@ -298,7 +298,7 @@ install -m 755 libcblas.so.%{version} %{buildroot}/%{_libdir}/blas
 ln -s libcblas.so.%{version} %{buildroot}/%{_libdir}/blas/libcblas.so.3
 ln -s blas/libcblas.so.%{version} %{buildroot}/%{_libdir}/libcblas.so
 # dummy target for update-alternatives
-ln -s %{_sysconfdir}/alternatives/libcblas.so.3 %{buildroot}/%{_libdir}/libcblas.so.3
+ln -s %{_sysconfdir}/alternatives/libcblas.so.3_%{arch} %{buildroot}/%{_libdir}/libcblas.so.3
 ## LAPACK
 install -d %{buildroot}/%{_libdir}/lapack
 install -m 644 liblapack.a %{buildroot}/%{_libdir}
@@ -306,7 +306,7 @@ install -m 755 liblapack.so.%{version} %{buildroot}/%{_libdir}/lapack
 ln -s liblapack.so.%{version} %{buildroot}/%{_libdir}/lapack/liblapack.so.3
 ln -s lapack/liblapack.so.%{version} %{buildroot}/%{_libdir}/liblapack.so
 # dummy target for update-alternatives
-ln -s %{_sysconfdir}/alternatives/liblapack.so.3 %{buildroot}/%{_libdir}/liblapack.so.3
+ln -s %{_sysconfdir}/alternatives/liblapack.so.3_%{_arch} %{buildroot}/%{_libdir}/liblapack.so.3
 ## LAPACKE
 cd LAPACKE
 install -m 644 include/*.h %{buildroot}/%{_includedir}
@@ -315,12 +315,12 @@ install -m 755 liblapacke.so.%{version} %{buildroot}/%{_libdir}/lapack
 ln -s liblapacke.so.%{version} %{buildroot}/%{_libdir}/lapack/liblapacke.so.3
 ln -s lapack/liblapacke.so.%{version} %{buildroot}/%{_libdir}/liblapacke.so
 # dummy target for update-alternatives
-ln -s %{_sysconfdir}/alternatives/liblapacke.so.3 %{buildroot}/%{_libdir}/liblapacke.so.3
+ln -s %{_sysconfdir}/alternatives/liblapacke.so.3_%{_arch} %{buildroot}/%{_libdir}/liblapacke.so.3
 cd ..
 
 %post -n libblas3
 %{_sbindir}/update-alternatives --install \
-   %{_libdir}/libblas.so.3 libblas.so.3 %{_libdir}/blas/libblas.so.3  50
+   %{_libdir}/libblas.so.3 libblas.so.3_%{_arch} %{_libdir}/blas/libblas.so.3  50
 /sbin/ldconfig
 
 %preun -n libblas3
@@ -339,7 +339,7 @@ fi
 
 %post -n liblapack3
 %{_sbindir}/update-alternatives --install \
-   %{_libdir}/liblapack.so.3 liblapack.so.3 %{_libdir}/lapack/liblapack.so.3  50
+   %{_libdir}/liblapack.so.3 liblapack.so.3_%{_arch} %{_libdir}/lapack/liblapack.so.3  50
 /sbin/ldconfig
 
 %preun -n liblapack3
@@ -358,7 +358,7 @@ fi
 
 %post -n libcblas3
 %{_sbindir}/update-alternatives --install \
-   %{_libdir}/libcblas.so.3 libcblas.so.3 %{_libdir}/blas/libcblas.so.3  50
+   %{_libdir}/libcblas.so.3 libcblas.so.3_%{_arch} %{_libdir}/blas/libcblas.so.3  50
 /sbin/ldconfig
 
 %preun -n libcblas3
@@ -377,7 +377,7 @@ fi
 
 %post -n liblapacke3
 %{_sbindir}/update-alternatives --install \
-   %{_libdir}/liblapacke.so.3 liblapacke.so.3 %{_libdir}/lapack/liblapacke.so.3  50
+   %{_libdir}/liblapacke.so.3 liblapacke.so.3_%{_arch} %{_libdir}/lapack/liblapacke.so.3  50
 /sbin/ldconfig
 
 %preun -n liblapacke3
@@ -401,7 +401,7 @@ fi
 %{_libdir}/lapack/liblapack.so.%{version}
 %{_libdir}/lapack/liblapack.so.3
 %ghost %{_libdir}/liblapack.so.3
-%ghost %{_sysconfdir}/alternatives/liblapack.so.3
+%ghost %{_sysconfdir}/alternatives/liblapack.so.3_%{_arch}
 
 %files -n libblas3
 %doc README.md
@@ -410,7 +410,7 @@ fi
 %{_libdir}/blas/libblas.so.%{version}
 %{_libdir}/blas/libblas.so.3
 %ghost %{_libdir}/libblas.so.3
-%ghost %{_sysconfdir}/alternatives/libblas.so.3
+%ghost %{_sysconfdir}/alternatives/libblas.so.3_%{_arch}
 
 %files devel
 %{_libdir}/liblapack.so
@@ -428,7 +428,7 @@ fi
 %{_libdir}/lapack/liblapacke.so.%{version}
 %{_libdir}/lapack/liblapacke.so.3
 %ghost %{_libdir}/liblapacke.so.3
-%ghost %{_sysconfdir}/alternatives/liblapacke.so.3
+%ghost %{_sysconfdir}/alternatives/liblapacke.so.3_%{_arch}
 
 %files -n lapacke-devel
 %doc LAPACKE/README
@@ -446,7 +446,7 @@ fi
 %{_libdir}/blas/libcblas.so.%{version}
 %{_libdir}/blas/libcblas.so.3
 %ghost %{_libdir}/libcblas.so.3
-%ghost %{_sysconfdir}/alternatives/libcblas.so.3
+%ghost %{_sysconfdir}/alternatives/libcblas.so.3_%{_arch}
 
 %files -n cblas-devel
 %doc CBLAS/README