AlmaLinux change: Set arch as x86_64_v2 for config file

This commit is contained in:
eabdullin 2024-12-10 12:04:06 +03:00
parent 81bba2c883
commit 3beb9252a3

View File

@ -12,7 +12,7 @@
Name: gpgme Name: gpgme
Summary: GnuPG Made Easy - high level crypto API Summary: GnuPG Made Easy - high level crypto API
Version: 1.23.2 Version: 1.23.2
Release: 6%{?dist} Release: 6%{?dist}.alma.1
# MIT: src/cJSON.{c,h} (used by gpgme-json) # MIT: src/cJSON.{c,h} (used by gpgme-json)
License: LGPL-2.1-or-later AND MIT License: LGPL-2.1-or-later AND MIT
@ -239,7 +239,11 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
# Hack to resolve multiarch conflict (#341351) # Hack to resolve multiarch conflict (#341351)
%ifarch %{multilib_arches} %ifarch %{multilib_arches}
%ifarch x86_64_v2
mv %{buildroot}%{_bindir}/gpgme-config{,.x86_64}
%else
mv %{buildroot}%{_bindir}/gpgme-config{,.%{_target_cpu}} mv %{buildroot}%{_bindir}/gpgme-config{,.%{_target_cpu}}
%endif
cat > gpgme-config-multilib.sh <<__END__ cat > gpgme-config-multilib.sh <<__END__
#!/bin/sh #!/bin/sh
exec %{_bindir}/gpgme-config.\$(arch) \$@ exec %{_bindir}/gpgme-config.\$(arch) \$@
@ -282,7 +286,11 @@ popd
%{_bindir}/%{name}-config %{_bindir}/%{name}-config
%{_bindir}/%{name}-tool %{_bindir}/%{name}-tool
%ifarch %{multilib_arches} %ifarch %{multilib_arches}
%ifarch x86_64_v2
%{_bindir}/%{name}-config.x86_64
%else
%{_bindir}/%{name}-config.%{_target_cpu} %{_bindir}/%{name}-config.%{_target_cpu}
%endif
%{_includedir}/%{name}-%{__isa_bits}.h %{_includedir}/%{name}-%{__isa_bits}.h
%endif %endif
%{_includedir}/%{name}.h %{_includedir}/%{name}.h