From c1192ecc9f12d43a450876533a7e8c7207f06bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Thu, 17 Oct 2019 13:28:00 +0200 Subject: [PATCH 1/4] Allow build for VM --- Makefile.builder | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.builder b/Makefile.builder index 7dbe63d..44e0fde 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -1,3 +1 @@ -ifeq ($(PACKAGE_SET),dom0) RPM_SPEC_FILES := rpm_spec/qmgr.spec -endif From 5bb2c88f76f743c61524f50dc31a5246a6bdc905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sat, 19 Oct 2019 09:52:41 +0200 Subject: [PATCH 2/4] travis: add dom0 and Fedora VM builds for R4.1 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f2337a0..7dc6df8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ script: - ~/qubes-builder/scripts/travis-build env: - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1 + - DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 + - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 + - DISTS_VM=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 # don't build tags which are meant for code signing only branches: From 17d6cf4ef1c14ecac4682f910e5866eeabf5ddaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Fri, 25 Oct 2019 10:15:41 +0200 Subject: [PATCH 3/4] travis: add CentOS 7 build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7dc6df8..36035c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ env: - DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 - DISTS_VM=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 + - DISTS_VM=centos7 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 # don't build tags which are meant for code signing only branches: From 62774ffd9d3db3b3a16f5b31737c4d07681defcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Fri, 25 Oct 2019 10:55:42 +0200 Subject: [PATCH 4/4] Handle CentOS 7 build. Fix URL --- rpm_spec/qmgr.spec.in | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/rpm_spec/qmgr.spec.in b/rpm_spec/qmgr.spec.in index c665f2b..dcbaf25 100644 --- a/rpm_spec/qmgr.spec.in +++ b/rpm_spec/qmgr.spec.in @@ -6,20 +6,24 @@ BuildArch: noarch Group: Qubes Vendor: Invisible Things Lab License: GPL -URL: http://fixme -Requires: python3 -Requires: python3-PyQt5 -Requires: python3-inotify -Requires: python3-qubesadmin >= 4.0.19 -Requires: python3-Quamash -Requires: qubes-desktop-linux-common >= 4.0.16 +URL: https://www.qubes-os.org +Requires: python%{python3_pkgversion} +Requires: python%{python3_pkgversion}-PyQt5 +Requires: python%{python3_pkgversion}-inotify +Requires: python%{python3_pkgversion}-qubesadmin >= 4.0.19 +Requires: python%{python3_pkgversion}-Quamash +Requires: qubes-desktop-linux-common >= 4.0.16 Requires: qubes-artwork Requires: pmount Requires: cryptsetup Requires: wmctrl -BuildRequires: python3-PyQt5-devel -BuildRequires: python3-devel +BuildRequires: python%{python3_pkgversion}-PyQt5-devel +BuildRequires: python%{python3_pkgversion}-devel +%if 0%{?rhel} == 7 +BuildRequires: qt5-qtbase-devel +%else BuildRequires: qt5-devel +%endif BuildRequires: qt5-linguist AutoReq: 0