rpms/vala
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix multilib conflicts in vala-gen-introspect

Browse Source
This commit is contained in:
Kalev Lember 2021-01-15 21:59:55 +01:00
parent c05d703f7e
commit 2f7f48fe4c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vala.spec
View File

@ -3,7 +3,7 @@
Name: vala Name: vala
Version: 0.48.12 Version: 0.48.12
Release: 1%{?dist} Release: 2%{?dist}
Summary: A modern programming language for GNOME Summary: A modern programming language for GNOME
# Most files are LGPLv2.1+, curses.vapi is 2-clause BSD # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD
@ -139,6 +139,12 @@ make %{?_smp_mflags}
%install %install
%make_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 # own this directory for third-party *.vapi files
mkdir -p $RPM_BUILD_ROOT%{_datadir}/vala/vapi mkdir -p $RPM_BUILD_ROOT%{_datadir}/vala/vapi
find %{buildroot} -name '*.la' -exec rm -f {} ';' find %{buildroot} -name '*.la' -exec rm -f {} ';'
@ -169,7 +175,7 @@ fi
%{_bindir}/valac %{_bindir}/valac
%{_bindir}/valac-%{api_ver} %{_bindir}/valac-%{api_ver}
%{_bindir}/vala-gen-introspect %{_bindir}/vala-gen-introspect
%{_bindir}/vala-gen-introspect-%{api_ver} %{_bindir}/vala-gen-introspect-%{api_ver}*
%{_bindir}/vapigen %{_bindir}/vapigen
%{_bindir}/vapigen-%{api_ver} %{_bindir}/vapigen-%{api_ver}
%{_libdir}/pkgconfig/vapigen*.pc %{_libdir}/pkgconfig/vapigen*.pc
@ -213,6 +219,9 @@ fi
%changelog %changelog
* Fri Jan 15 2021 Kalev Lember <klember@redhat.com> - 0.48.12-2
- Fix multilib conflicts in vala-gen-introspect
* Thu Nov 19 2020 Kalev Lember <klember@redhat.com> - 0.48.12-1 * Thu Nov 19 2020 Kalev Lember <klember@redhat.com> - 0.48.12-1
- Update to 0.48.12 - Update to 0.48.12