diff --git a/SPECS/vala.spec b/SPECS/vala.spec index 59e10ee..e148303 100644 --- a/SPECS/vala.spec +++ b/SPECS/vala.spec @@ -3,7 +3,7 @@ Name: vala Version: 0.40.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern programming language for GNOME # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD @@ -131,6 +131,13 @@ do rm $RPM_BUILD_ROOT%{_mandir}/man1/$f.1* touch $RPM_BUILD_ROOT%{_mandir}/man1/$f.1.gz done + +# Avoid multilib conflicts in vala-gen-introspect +mv %{buildroot}%{_bindir}/vala-gen-introspect-%{api_ver}{,-`uname -m`} +echo -e '#!/bin/sh\nexec %{_bindir}/vala-gen-introspect-%{api_ver}-`uname -m` "$@"' > \ + %{buildroot}%{_bindir}/vala-gen-introspect-%{api_ver} + chmod +x %{buildroot}%{_bindir}/vala-gen-introspect-%{api_ver} + # own this directory for third-party *.vapi files mkdir -p $RPM_BUILD_ROOT%{_datadir}/vala/vapi find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -173,7 +180,7 @@ done %ghost %{_bindir}/vapigen %{_bindir}/vala-%{api_ver} %{_bindir}/valac-%{api_ver} -%{_bindir}/vala-gen-introspect-%{api_ver} +%{_bindir}/vala-gen-introspect-%{api_ver}* %{_bindir}/vapigen-%{api_ver} %{_libdir}/pkgconfig/vapigen*.pc %{_libdir}/vala-%{api_ver}/ @@ -213,6 +220,10 @@ done %changelog +* Fri Jan 15 2021 Kalev Lember - 0.40.19-2 +- Fix multilib conflicts in vala-gen-introspect +- Resolves: #1853170 + * Mon Feb 17 2020 Kalev Lember - 0.40.19-1 - Update to 0.40.19 - Resolves: #1753520