Bring i686 support back

llvm.spec

@@ -267,7 +267,7 @@
 #region main package
 Name:		%{pkg_name_llvm}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	2%{?dist}.alma.1
+Release:	2%{?dist}.alma.2
 Summary:	The Low Level Virtual Machine
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@@ -1801,11 +1801,6 @@ popd
 rm -f %{buildroot}%{install_libdir}/libLLVMBOLT*.a
 #endregion BOLT installation
 
-# Do not create symlinks for i686 to avoid multilib conflicts.
-# Don't ship man pages altogether.
-%ifarch %{ix86}
-rm -rf %{buildroot}%{install_mandir}
-%else
 # Create symlinks from the system install prefix to the llvm install prefix.
 # Do this at the end so it includes any files added by preceding steps.
 mkdir -p %{buildroot}%{_bindir}
@@ -1863,7 +1858,6 @@ rm -Rf %{buildroot}%{_libdir}/amdgcn-amd-amdhsa
 rm -Rf %{buildroot}%{_libdir}/nvptx64-nvidia-cuda
 %endif
 %endif
-%endif
 
 %if %{with bundle_compat_lib}
 install -m 0755 ../llvm-compat-libs/lib/libLLVM.so.%{compat_maj_ver}* %{buildroot}%{_libdir}
@@ -2329,17 +2323,14 @@ fi
   local maj_ver = rpm.expand("%{maj_ver}")
   for arg in rpm.expand("%*"):gmatch("%S+") do
     print(install_bindir .. "/" .. arg .. "\\n")
-    if not rpm.expand("%{ix86}"):find(rpm.expand("%{_arch}")) then
       print(bindir .. "/" .. arg .. "-" .. maj_ver .. "\\n")
       if rpm.expand("%{without compat_build}") == "1" then
         print(bindir .. "/" .. arg .. "\\n")
       end
     end
-  end
 }
 
 %define expand_mans() %{lua:
-  if not rpm.expand("%{ix86}"):find(rpm.expand("%{_arch}")) then
     local mandir = rpm.expand("%{_mandir}")
     local maj_ver = rpm.expand("%{maj_ver}")
     for arg in rpm.expand("%*"):gmatch("%S+") do
@@ -2348,7 +2339,6 @@ fi
         print(mandir .. "/man1/" .. arg .. ".1.gz\\n")
       end
     end
-  end
 }
 
 %define expand_generic(d:i:) %{lua:
@@ -2356,8 +2346,7 @@ fi
   local install_dir = rpm.expand("%{-i*}")
   for arg in rpm.expand("%*"):gmatch("%S+") do
     print(install_dir .. "/" .. arg .. "\\n")
-    if rpm.expand("%{without compat_build}") == "1" and
-       not rpm.expand("%{ix86}"):find(rpm.expand("%{_arch}")) then
+    if rpm.expand("%{without compat_build}") == "1" then
       print(dir .. "/" .. arg .. "\\n")
     end
   end
@@ -2590,11 +2579,9 @@ fi
 %exclude %{install_libdir}/libLLVMTestingSupport.a
 %exclude %{install_libdir}/libLLVMTestingAnnotations.a
 %if %{without compat_build}
-%ifnarch %{ix86}
 %exclude %{_libdir}/libLLVMTestingSupport.a
 %exclude %{_libdir}/libLLVMTestingAnnotations.a
 %endif
-%endif
 
 %files -n %{pkg_name_llvm}-cmake-utils
 %license llvm/LICENSE.TXT
@@ -2679,10 +2666,8 @@ fi
 %expand_bins clang-tblgen
 %dir %{install_datadir}/clang/
 %if %{without compat_build}
-%ifnarch %{ix86}
 %dir %{_datadir}/clang
 %endif
-%endif
 
 %files -n %{pkg_name_clang}-resource-filesystem
 %license clang/LICENSE.TXT
@@ -3096,6 +3081,9 @@ fi
 
 #region changelog
 %changelog
+* Fri Nov 28 2025 Eduard Abdullin <eabdullin@almalinux.org> - 20.1.4-2.alma.2
+- Bring i686 support back
+
 * Tue Jul 29 2025 Eduard Abdullin <eabdullin@almalinux.org> - 20.1.4-2.alma.1
 - Use x86_64-redhat-linux as default gcc triple for x86_64_v2
 - Add riscv64 support