Merge commit '43a62dabf0c6be28d0263a895f80ab90895e3dcd' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

llvm.spec

@@ -97,7 +97,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	1.0.riscv64%{?dist}
+Release:	2.0.riscv64%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@@ -479,15 +479,34 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir}  %{__ninja} check-all -C %{_vpath
 %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}
 %if %{without compat_build}
 %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}
+
+# During the upgrade from LLVM 16 (F38) to LLVM 17 (F39), we found out the
+# main llvm-devel package was leaving entries in the alternatives system.
+# Try to remove them now.
+for v in 14 15 16; do
+  if [[ -e %{_bindir}/llvm-config-$v
+		&& "x$(%{_bindir}/llvm-config-$v --version | awk -F . '{ print $1 }')" != "x$v" ]]; then
+    %{_sbindir}/update-alternatives --remove llvm-config-$v %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
+  fi
+done
 %endif
 
+
 %postun devel
 if [ $1 -eq 0 ]; then
   %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
-%if %{without compat_build}
-  %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
-%endif
 fi
+%if %{without compat_build}
+# When upgrading between minor versions (i.e. from x.y.1 to x.y.2), we must
+# not remove the alternative.
+# However, during a major version upgrade (i.e. from 16.x.y to 17.z.w), the
+# alternative must be removed in order to give priority to a newly installed
+# compat package.
+if [[ $1 -eq 0
+	  || "x$(%{_bindir}/llvm-config-%{maj_ver} --version | awk -F . '{ print $1 }')" != "x%{maj_ver}" ]]; then
+  %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
+fi
+%endif
 
 %files
 %license LICENSE.TXT
@@ -596,11 +615,14 @@ fi
 %changelog
 %{?llvm_snapshot_changelog_entry}
 
-* Mon Dec 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.6-1.0.riscv64
+* Tue Jan 23 2024 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.6-2.0.riscv64
 - Disable LTO build
 - Disable tests on riscv64 for now
 - Lower memory consumption on riscv64
 
+* Thu Nov 30 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.6-2
+- Fix rhbz #2248872
+
 * Tue Nov 28 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.6-1
 - Update to LLVM 17.0.6