Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
guests/playbooks/build/jobs/defaults.yml | 1 +
guests/vars/projects/virt-viewer+mingw32.yml | 1 -
guests/vars/projects/virt-viewer+mingw64.yml | 1 -
guests/vars/projects/virt-viewer.yml | 1 -
jenkins/jobs/defaults.yaml | 1 +
jenkins/projects/virt-viewer+mingw32.yaml | 4 +++-
jenkins/projects/virt-viewer+mingw64.yaml | 4 +++-
jenkins/projects/virt-viewer.yaml | 4 +++-
8 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml
index 8a9eebc..f43ebd0 100644
--- a/guests/playbooks/build/jobs/defaults.yml
+++ b/guests/playbooks/build/jobs/defaults.yml
@@ -26,6 +26,7 @@ strip_buildrequires: |
sed -i -e 's/BuildRequires: *libvirt.*//' *.spec*
sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec*
sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec*
+ sed -i -e 's/BuildRequires: *pkgconfig(gtk-vnc-.*).*//' *.spec*
sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec*
mingw32_local_env: |
export VIRT_PREFIX="$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw"
diff --git a/guests/vars/projects/virt-viewer+mingw32.yml b/guests/vars/projects/virt-viewer+mingw32.yml
index 2b914c3..608d722 100644
--- a/guests/vars/projects/virt-viewer+mingw32.yml
+++ b/guests/vars/projects/virt-viewer+mingw32.yml
@@ -6,7 +6,6 @@ packages:
- mingw32-gstreamer1-plugins-bad-free
- mingw32-gstreamer1-plugins-good
- mingw32-gtk3
- - mingw32-gtk-vnc2
- mingw32-libgovirt
- mingw32-libusbx
- mingw32-rest
diff --git a/guests/vars/projects/virt-viewer+mingw64.yml b/guests/vars/projects/virt-viewer+mingw64.yml
index 6b42a7f..3aa5893 100644
--- a/guests/vars/projects/virt-viewer+mingw64.yml
+++ b/guests/vars/projects/virt-viewer+mingw64.yml
@@ -6,7 +6,6 @@ packages:
- mingw64-gstreamer1-plugins-bad-free
- mingw64-gstreamer1-plugins-good
- mingw64-gtk3
- - mingw64-gtk-vnc2
- mingw64-libgovirt
- mingw64-libusbx
- mingw64-rest
diff --git a/guests/vars/projects/virt-viewer.yml b/guests/vars/projects/virt-viewer.yml
index cd32176..6ce638c 100644
--- a/guests/vars/projects/virt-viewer.yml
+++ b/guests/vars/projects/virt-viewer.yml
@@ -1,7 +1,6 @@
---
packages:
- glib2
- - gtk-vnc2
- gtk3
- intltool
- libgovirt
diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml
index 7fb6d68..f3ba850 100644
--- a/jenkins/jobs/defaults.yaml
+++ b/jenkins/jobs/defaults.yaml
@@ -26,6 +26,7 @@
sed -i -e 's/BuildRequires: *libvirt.*//' *.spec*
sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec*
sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec*
+ sed -i -e 's/BuildRequires: *pkgconfig(gtk-vnc-.*).*//' *.spec*
sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec*
mingw32_local_env: |
export VIRT_PREFIX="$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw"
diff --git a/jenkins/projects/virt-viewer+mingw32.yaml b/jenkins/projects/virt-viewer+mingw32.yaml
index c9c74ea..7d4738a 100644
--- a/jenkins/projects/virt-viewer+mingw32.yaml
+++ b/jenkins/projects/virt-viewer+mingw32.yaml
@@ -7,6 +7,8 @@
git_url: '{git_urls[virt-viewer][default]}'
jobs:
- autotools-build-job:
- parent_jobs: 'libvirt-glib+mingw32-build'
+ parent_jobs:
+ - 'libvirt-glib+mingw32-build'
+ - 'gtk-vnc+mingw32-build'
local_env: '{mingw32_local_env}'
autogen_args: '{mingw32_autogen_args}'
diff --git a/jenkins/projects/virt-viewer+mingw64.yaml b/jenkins/projects/virt-viewer+mingw64.yaml
index c3b570f..dfbd70d 100644
--- a/jenkins/projects/virt-viewer+mingw64.yaml
+++ b/jenkins/projects/virt-viewer+mingw64.yaml
@@ -7,6 +7,8 @@
git_url: '{git_urls[virt-viewer][default]}'
jobs:
- autotools-build-job:
- parent_jobs: 'libvirt-glib+mingw64-build'
+ parent_jobs:
+ - 'libvirt-glib+mingw64-build'
+ - 'gtk-vnc+mingw64-build'
local_env: '{mingw64_local_env}'
autogen_args: '{mingw64_autogen_args}'
diff --git a/jenkins/projects/virt-viewer.yaml b/jenkins/projects/virt-viewer.yaml
index f06da31..87b5853 100644
--- a/jenkins/projects/virt-viewer.yaml
+++ b/jenkins/projects/virt-viewer.yaml
@@ -7,7 +7,9 @@
git_url: '{git_urls[virt-viewer][default]}'
jobs:
- autotools-build-job:
- parent_jobs: 'libvirt-glib-build'
+ parent_jobs:
+ - 'libvirt-glib-build'
+ - 'gtk-vnc-build'
- autotools-syntax-check-job:
parent_jobs: 'virt-viewer-build'
- autotools-check-job:
--
2.21.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
