Re: [Spice-devel] [vdagent-win PATCH v13 6/6] spec: run tests during RPM build if possible
On Wed, Jul 26, 2017 at 06:04:48AM -0400, Frediano Ziglio wrote: > > > > On Tue, Jul 25, 2017 at 06:33:36PM +0100, Frediano Ziglio wrote: > > > Currently to fully run checks we need Wine for both 32 and 64 bit. > > > Some distros (like RHEL 7) don't seem to allow installing > > > both 32 and 64 bit versions so turn on checks based on distro > > > versions. > > > > > > Signed-off-by: Frediano Ziglio> > > > > > > > still Acked-by: Christophe Fergeau > > > > I know but I prefer to send again the full series to > make patchwork more happy. Oh, this was not a complaint, just a confirmation that I hadn't changed my mind (especially as there were minor changes to the patch). Christophe signature.asc Description: PGP signature ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [vdagent-win PATCH v13 6/6] spec: run tests during RPM build if possible
> > On Tue, Jul 25, 2017 at 06:33:36PM +0100, Frediano Ziglio wrote: > > Currently to fully run checks we need Wine for both 32 and 64 bit. > > Some distros (like RHEL 7) don't seem to allow installing > > both 32 and 64 bit versions so turn on checks based on distro > > versions. > > > > Signed-off-by: Frediano Ziglio> > > > still Acked-by: Christophe Fergeau > I know but I prefer to send again the full series to make patchwork more happy. Frediano > > --- > > mingw-spice-vdagent.spec.in | 27 +++ > > 1 file changed, 27 insertions(+) > > > > diff --git a/mingw-spice-vdagent.spec.in b/mingw-spice-vdagent.spec.in > > index f874e66..d25ea31 100644 > > --- a/mingw-spice-vdagent.spec.in > > +++ b/mingw-spice-vdagent.spec.in > > @@ -2,6 +2,19 @@ > > > > #define _version_suffix -e198 > > > > +%if "%{_build_arch}" == "x86_64" && (0%{?fedora} && 0%{?fedora} >= 24) > > +%define can_do_check_x64 1 > > +%define can_do_check_x86 1 > > +%else > > +%if "%{_build_arch}" == "x86_64" && (0%{?epel} && 0%{?epel} >= 7) > > +%define can_do_check_x64 1 > > +%define can_do_check_x86 0 > > +%else > > +%define can_do_check_x64 0 > > +%define can_do_check_x86 0 > > +%endif > > +%endif > > + > > Name: mingw-spice-vdagent > > Version:@VERSION@ > > Release:1%{?dist}%{?extra_release} > > @@ -22,6 +35,12 @@ BuildRequires: mingw64-zlib-static > > BuildRequires: mingw32-winpthreads-static > > BuildRequires: mingw64-winpthreads-static > > BuildRequires: pkgconfig > > +%if 0%{can_do_check_x64} > > +BuildRequires: ImageMagick wine-core(x86-64) > > +%endif > > +%if 0%{can_do_check_x86} > > +BuildRequires: ImageMagick wine-core(x86-32) > > +%endif > > > > BuildArch: noarch > > > > @@ -73,6 +92,14 @@ Features: > > %mingw_configure --enable-debug > > %mingw_make %{?_smp_mflags} V=1 > > > > +%if 0%{can_do_check_x86} || 0%{can_do_check_x64} > > +%check > > +%define mingw_build_win32 %{can_do_check_x86} > > +%define mingw_build_win64 %{can_do_check_x64} > > +%mingw_make check > > +%define mingw_build_win32 1 > > +%define mingw_build_win64 1 > > +%endif > > > > %install > > %mingw_make_install DESTDIR=$RPM_BUILD_ROOT ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [vdagent-win PATCH v13 6/6] spec: run tests during RPM build if possible
On Tue, Jul 25, 2017 at 06:33:36PM +0100, Frediano Ziglio wrote: > Currently to fully run checks we need Wine for both 32 and 64 bit. > Some distros (like RHEL 7) don't seem to allow installing > both 32 and 64 bit versions so turn on checks based on distro > versions. > > Signed-off-by: Frediano Zigliostill Acked-by: Christophe Fergeau > --- > mingw-spice-vdagent.spec.in | 27 +++ > 1 file changed, 27 insertions(+) > > diff --git a/mingw-spice-vdagent.spec.in b/mingw-spice-vdagent.spec.in > index f874e66..d25ea31 100644 > --- a/mingw-spice-vdagent.spec.in > +++ b/mingw-spice-vdagent.spec.in > @@ -2,6 +2,19 @@ > > #define _version_suffix -e198 > > +%if "%{_build_arch}" == "x86_64" && (0%{?fedora} && 0%{?fedora} >= 24) > +%define can_do_check_x64 1 > +%define can_do_check_x86 1 > +%else > +%if "%{_build_arch}" == "x86_64" && (0%{?epel} && 0%{?epel} >= 7) > +%define can_do_check_x64 1 > +%define can_do_check_x86 0 > +%else > +%define can_do_check_x64 0 > +%define can_do_check_x86 0 > +%endif > +%endif > + > Name: mingw-spice-vdagent > Version:@VERSION@ > Release:1%{?dist}%{?extra_release} > @@ -22,6 +35,12 @@ BuildRequires: mingw64-zlib-static > BuildRequires: mingw32-winpthreads-static > BuildRequires: mingw64-winpthreads-static > BuildRequires: pkgconfig > +%if 0%{can_do_check_x64} > +BuildRequires: ImageMagick wine-core(x86-64) > +%endif > +%if 0%{can_do_check_x86} > +BuildRequires: ImageMagick wine-core(x86-32) > +%endif > > BuildArch: noarch > > @@ -73,6 +92,14 @@ Features: > %mingw_configure --enable-debug > %mingw_make %{?_smp_mflags} V=1 > > +%if 0%{can_do_check_x86} || 0%{can_do_check_x64} > +%check > +%define mingw_build_win32 %{can_do_check_x86} > +%define mingw_build_win64 %{can_do_check_x64} > +%mingw_make check > +%define mingw_build_win32 1 > +%define mingw_build_win64 1 > +%endif > > %install > %mingw_make_install DESTDIR=$RPM_BUILD_ROOT > -- > 2.13.3 > > ___ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/spice-devel signature.asc Description: PGP signature ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel