From 1b3a060b3eaf4aa4482ebe808d8bc9682a1429da Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 21 Jun 2023 16:07:30 -0400 Subject: [PATCH] Limit validate test deps in RHEL builds RHEL includes a very small subset of MinGW-related packages for building select virtualization components for Windows guests. --- msitools.spec | 78 ++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/msitools.spec b/msitools.spec index 7007d2f..e26fb11 100644 --- a/msitools.spec +++ b/msitools.spec @@ -34,6 +34,29 @@ BuildRequires: bison %if %{with_validate} BuildRequires: perl-base BuildRequires: perl-XML-XPath +# these are available in the RHEL/ELN buildroot +# pcre2 and srvany are also available but not used by the tests +BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw64-gcc-c++ +BuildRequires: mingw32-gcc +BuildRequires: mingw64-gcc +BuildRequires: mingw32-gettext +BuildRequires: mingw64-gettext +BuildRequires: mingw32-glib2 +BuildRequires: mingw64-glib2 +BuildRequires: mingw32-libffi +BuildRequires: mingw64-libffi +BuildRequires: mingw32-pixman +BuildRequires: mingw64-pixman +BuildRequires: mingw32-termcap +BuildRequires: mingw64-termcap +BuildRequires: mingw32-win-iconv +BuildRequires: mingw64-win-iconv +BuildRequires: mingw32-winpthreads +BuildRequires: mingw64-winpthreads +BuildRequires: mingw32-zlib +BuildRequires: mingw64-zlib +%if %{undefined rhel} BuildRequires: mingw32-adwaita-icon-theme BuildRequires: mingw64-adwaita-icon-theme BuildRequires: mingw32-atk @@ -54,16 +77,8 @@ BuildRequires: mingw32-fontconfig BuildRequires: mingw64-fontconfig BuildRequires: mingw32-freetype BuildRequires: mingw64-freetype -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw64-gcc-c++ -BuildRequires: mingw32-gcc -BuildRequires: mingw64-gcc BuildRequires: mingw32-gdk-pixbuf BuildRequires: mingw64-gdk-pixbuf -BuildRequires: mingw32-gettext -BuildRequires: mingw64-gettext -BuildRequires: mingw32-glib2 -BuildRequires: mingw64-glib2 BuildRequires: mingw32-glib-networking BuildRequires: mingw64-glib-networking BuildRequires: mingw32-gmp @@ -100,10 +115,12 @@ BuildRequires: mingw32-jasper BuildRequires: mingw64-jasper BuildRequires: mingw32-json-glib BuildRequires: mingw64-json-glib +BuildRequires: mingw32-lcms2 +BuildRequires: mingw64-lcms2 +BuildRequires: mingw32-libcroco +BuildRequires: mingw64-libcroco BuildRequires: mingw32-libepoxy BuildRequires: mingw64-libepoxy -BuildRequires: mingw32-libffi -BuildRequires: mingw64-libffi BuildRequires: mingw32-libgcrypt BuildRequires: mingw64-libgcrypt BuildRequires: mingw32-libgovirt @@ -116,10 +133,14 @@ BuildRequires: mingw32-libjpeg-turbo BuildRequires: mingw64-libjpeg-turbo BuildRequires: mingw32-libogg BuildRequires: mingw64-libogg +BuildRequires: mingw32-pcre +BuildRequires: mingw64-pcre BuildRequires: mingw32-libpng BuildRequires: mingw64-libpng BuildRequires: mingw32-libpsl BuildRequires: mingw64-libpsl +BuildRequires: mingw32-librsvg2 +BuildRequires: mingw64-librsvg2 BuildRequires: mingw32-libsoup BuildRequires: mingw64-libsoup BuildRequires: mingw32-libssh2 @@ -140,12 +161,18 @@ BuildRequires: mingw32-libvirt BuildRequires: mingw64-libvirt BuildRequires: mingw32-libvorbis BuildRequires: mingw64-libvorbis +BuildRequires: mingw32-libwebp +BuildRequires: mingw64-libwebp BuildRequires: mingw32-libxml2 BuildRequires: mingw64-libxml2 BuildRequires: mingw32-nettle BuildRequires: mingw64-nettle -BuildRequires: mingw32-OpenEXR -BuildRequires: mingw64-OpenEXR +BuildRequires: mingw32-openal-soft +BuildRequires: mingw64-openal-soft +BuildRequires: mingw32-openexr +BuildRequires: mingw64-openexr +BuildRequires: mingw32-openjpeg2 +BuildRequires: mingw64-openjpeg2 BuildRequires: mingw32-openssl BuildRequires: mingw64-openssl BuildRequires: mingw32-opus @@ -156,10 +183,6 @@ BuildRequires: mingw32-p11-kit BuildRequires: mingw64-p11-kit BuildRequires: mingw32-pango BuildRequires: mingw64-pango -BuildRequires: mingw32-pcre -BuildRequires: mingw64-pcre -BuildRequires: mingw32-pixman -BuildRequires: mingw64-pixman BuildRequires: mingw32-portablexdr BuildRequires: mingw64-portablexdr BuildRequires: mingw32-readline @@ -174,32 +197,11 @@ BuildRequires: mingw32-spice-gtk3 BuildRequires: mingw64-spice-gtk3 BuildRequires: mingw32-sqlite BuildRequires: mingw64-sqlite -BuildRequires: mingw32-termcap -BuildRequires: mingw64-termcap BuildRequires: mingw32-usbredir BuildRequires: mingw64-usbredir BuildRequires: mingw32-wavpack BuildRequires: mingw64-wavpack -BuildRequires: mingw32-win-iconv -BuildRequires: mingw64-win-iconv -BuildRequires: mingw32-winpthreads -BuildRequires: mingw64-winpthreads -BuildRequires: mingw32-zlib -BuildRequires: mingw64-zlib -BuildRequires: mingw32-librsvg2 -BuildRequires: mingw64-librsvg2 -BuildRequires: mingw32-openjpeg2 -BuildRequires: mingw64-openjpeg2 -BuildRequires: mingw32-openexr -BuildRequires: mingw64-openexr -BuildRequires: mingw32-openal-soft -BuildRequires: mingw64-openal-soft -BuildRequires: mingw32-libwebp -BuildRequires: mingw64-libwebp -BuildRequires: mingw32-libcroco -BuildRequires: mingw64-libcroco -BuildRequires: mingw32-lcms2 -BuildRequires: mingw64-lcms2 +%endif %endif # https://bugzilla.redhat.com/show_bug.cgi?id=1924216