These changes allow './autobuild.sh' to complete again, when a full mingw cross-compilation is available on Fedora. * libvirt.spec.in (%file): List new installed files. * configure.ac (with_init_script): Assume default of none when cross-compiling. --- configure.ac | 6 +++--- mingw32-libvirt.spec.in | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d42d9e6..6c0fc69 100644 --- a/configure.ac +++ b/configure.ac @@ -276,10 +276,10 @@ AC_ARG_WITH([init-script], [AC_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@], [Style of init script to install @<:@default=auto@:>@])]) if test "x$with_init_script" = "x" || test "x$with_init_script" = "xauto"; then - if test -f /etc/redhat-release ; then - with_init_script=redhat - else + if test "$cross_compiling" = yes || test ! -f /etc/redhat-release; then with_init_script=none + else + with_init_script=redhat fi fi AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test x$with_init_script = xredhat) diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 6b2b5c6..4bbbc3b 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -71,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/* rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/* rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt.a +rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt-qemu.a %clean @@ -83,10 +84,13 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/virsh.exe %{_mingw32_bindir}/virt-xml-validate %{_mingw32_bindir}/virt-pki-validate +%{_mingw32_bindir}/libvirt-qemu-0.dll %{_mingw32_libdir}/libvirt.dll.a %{_mingw32_libdir}/libvirt.la %{_mingw32_libdir}/pkgconfig/libvirt.pc +%{_mingw32_libdir}/libvirt-qemu.dll.a +%{_mingw32_libdir}/libvirt-qemu.la %dir %{_mingw32_datadir}/libvirt/ %dir %{_mingw32_datadir}/libvirt/schemas/ @@ -109,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_mingw32_includedir}/libvirt %{_mingw32_includedir}/libvirt/libvirt.h %{_mingw32_includedir}/libvirt/virterror.h +%{_mingw32_includedir}/libvirt/libvirt-qemu.h %{_mingw32_mandir}/man1/virsh.1* %{_mingw32_mandir}/man1/virt-xml-validate.1* -- 1.7.2.2