diff --git a/vala.spec b/vala.spec index 891b725..3593a34 100644 --- a/vala.spec +++ b/vala.spec @@ -3,7 +3,7 @@ Name: vala Version: 0.48.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern programming language for GNOME # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD @@ -11,12 +11,13 @@ License: LGPLv2+ and BSD URL: https://wiki.gnome.org/Projects/Vala Source0: https://download.gnome.org/sources/vala/0.48/vala-%{version}.tar.xz -BuildRequires: flex BuildRequires: bison +BuildRequires: flex BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: graphviz-devel BuildRequires: libxslt +BuildRequires: make # only if Vala source files are patched #BuildRequires: vala @@ -138,6 +139,12 @@ make %{?_smp_mflags} %install %make_install +# 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 {} ';' @@ -168,7 +175,7 @@ fi %{_bindir}/valac %{_bindir}/valac-%{api_ver} %{_bindir}/vala-gen-introspect -%{_bindir}/vala-gen-introspect-%{api_ver} +%{_bindir}/vala-gen-introspect-%{api_ver}* %{_bindir}/vapigen %{_bindir}/vapigen-%{api_ver} %{_libdir}/pkgconfig/vapigen*.pc @@ -212,6 +219,9 @@ fi %changelog +* Fri Jan 15 2021 Kalev Lember - 0.48.12-2 +- Fix multilib conflicts in vala-gen-introspect + * Thu Nov 19 2020 Kalev Lember - 0.48.12-1 - Update to 0.48.12