From ff5a0b892ec7fad2b158ad1838f7d78c8e093e1c Mon Sep 17 00:00:00 2001 From: Fabiano Fidêncio Date: Jun 19 2019 12:16:19 +0000 Subject: Add %%mingw_ninja_install macro In order to make the life of the mingw packages easier, let's add a %%mingw_ninja_install macro that will run `ninja -C install` in the proper directory (the one configured using %%mingw_meson macro), passing the correct DESTDIR to ninja. In case it's not done, po files are not correctly installed and %%mingw_find_lang macro will fail. Signed-off-by: Fabiano Fidêncio --- diff --git a/macros.mingw b/macros.mingw index a30b141..c152d6d 100644 --- a/macros.mingw +++ b/macros.mingw @@ -172,5 +172,17 @@ ninja -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_NINJA_ARGS \ } \ run_mingw_ninja +%mingw_ninja_install \ +run_mingw_ninja_install() \ +{ \ +%if 0%{?mingw_build_win32} == 1 \ +DESTDIR=%{buildroot} ninja -C build_win32$MINGW_BUILDDIR_SUFFIX install \ +%endif \ +%if 0%{?mingw_build_win64} == 1 \ +DESTDIR=%{buildroot} ninja -C build_win64$MINGW_BUILDDIR_SUFFIX install \ +%endif \ +} \ +run_mingw_ninja_install + # Deprecated: %mingw_make_install %mingw_make install diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 7fe492f..175342f 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,7 +6,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 106 +Version: 107 Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %changelog +* Wed Jun 19 2019 Fabiano Fidêncio - 107-1 +- Add %%mingw_ninja_install macro + * Thu Feb 14 2019 Sandro Mani - 106-1 - Revert "Remove redundant $@ in mingw_cmake and mingw_meson", it causes no arguments at all to be passed to cmake