diff --git a/SPECS/uuid.spec b/SPECS/uuid.spec index 843d822..3454fdb 100644 --- a/SPECS/uuid.spec +++ b/SPECS/uuid.spec @@ -6,7 +6,7 @@ Name: uuid Version: 1.6.2 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -156,6 +156,13 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* popd +# fix multilib issues +cp $RPM_BUILD_ROOT/%{_bindir}/uuid-config $RPM_BUILD_ROOT/%{_bindir}/uuid-config.$(uname -m) +cat >$RPM_BUILD_ROOT/%{_bindir}/uuid-config <<EOF +#!/bin/sh +exec \$0.\$(uname -m) "\$@" +EOF + %check make check @@ -191,7 +198,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%{_bindir}/uuid-config +%{_bindir}/uuid-config* %{_includedir}/uuid.h %{_libdir}/libossp-uuid.so %{_libdir}/pkgconfig/ossp-uuid.pc @@ -224,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Fri Oct 30 2020 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-43 +- fix multilib compatibility (#1853169) + * Mon Oct 15 2018 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-42 - fix coverity scan found issues (#1602724)