From 52ddcd59f56be09562926e29e9b4093bbe594283 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 31 Jul 2024 12:40:12 +0000 Subject: [PATCH] Add versioned macros From: https://src.fedoraproject.org/rpms/clang/c/1382930328753fc5d7c62a2b494883036a984878?branch=rawhide --- files.spec.inc | 2 -- install.spec.inc | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/files.spec.inc b/files.spec.inc index 13a5471..8576e09 100644 --- a/files.spec.inc +++ b/files.spec.inc @@ -376,9 +376,7 @@ %dir %{install_prefix}/lib/clang/%{maj_ver}/include/ %dir %{install_prefix}/lib/clang/%{maj_ver}/lib/ %dir %{install_prefix}/lib/clang/%{maj_ver}/share/ -%if %{without compat_build} %{_rpmmacrodir}/macros.%{pkg_name_clang} -%endif %files -n %{pkg_name_clang}-analyzer %license clang/LICENSE.TXT diff --git a/install.spec.inc b/install.spec.inc index a124a00..5e1feca 100644 --- a/install.spec.inc +++ b/install.spec.inc @@ -195,6 +195,10 @@ rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh # populated by other packages mkdir -p %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/ +#Add versioned resource directory macro +mkdir -p %{buildroot}%{_rpmmacrodir}/ +echo "%%clang%{maj_ver}_resource_dir %%{_prefix}/lib/clang/%{maj_ver}" >> %{buildroot}%{_rpmmacrodir}/macros.%{name} + # Install config file for clang %if %{maj_ver} >=18 mkdir -p %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/