From e00a64a915ffbe162af3cd3921466a7c0b876509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Tue, 4 Jun 2019 23:59:12 +0200
Subject: [PATCH 1/3] python3: use macro pkgversion

---
 rpm_spec/qubes-utils.spec.in | 42 ++++++++----------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/rpm_spec/qubes-utils.spec.in b/rpm_spec/qubes-utils.spec.in
index 7048225..984c6f5 100644
--- a/rpm_spec/qubes-utils.spec.in
+++ b/rpm_spec/qubes-utils.spec.in
@@ -11,20 +11,12 @@ URL:		http://www.qubes-os.org
 Requires:	udev
 Requires:	%{name}-libs
 Requires:	ImageMagick
-%if 0%{?rhel} >= 7
-Requires:	python34-qubesimgconverter
-%else
-Requires:	python3-qubesimgconverter
-%endif
+Requires:	python%{python3_pkgversion}-qubesimgconverter
 %{?systemd_requires}
 BuildRequires:  systemd
 BuildRequires:  qubes-libvchan-devel
 BuildRequires:  python-setuptools
-%if 0%{?rhel} >= 7
-BuildRequires:  python34-setuptools
-%else
-BuildRequires:  python3-setuptools
-%endif
+BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python2-rpm-macros
 BuildRequires:  python3-rpm-macros
 # for meminfo-writer
@@ -49,27 +41,15 @@ Requires:   python2-numpy
 %description -n python2-qubesimgconverter
 Python package qubesimgconverter
 
-%if 0%{?rhel} >= 7
-%package -n python34-qubesimgconverter
+%package -n python%{python3_pkgversion}-qubesimgconverter
 Summary:    Python package qubesimgconverter
-Requires:   python34
-Requires:   python34-cairo
-Requires:   python34-pillow
-Requires:   python34-numpy
+Requires:   python%{python3_pkgversion}
+Requires:   python%{python3_pkgversion}-cairo
+Requires:   python%{python3_pkgversion}-pillow
+Requires:   python%{python3_pkgversion}-numpy
 
-%description -n python34-qubesimgconverter
+%description -n python%{python3_pkgversion}-qubesimgconverter
 Python package qubesimgconverter
-%else
-%package -n python3-qubesimgconverter
-Summary:    Python package qubesimgconverter
-Requires:   python3
-Requires:   python3-cairo
-Requires:   python3-pillow
-Requires:   python3-numpy
-
-%description -n python3-qubesimgconverter
-Python package qubesimgconverter
-%endif
 
 %package devel
 Summary:	Development headers for qubes-utils
@@ -133,11 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python2_sitelib}/qubesimgconverter/test_integ.py*
 %{python2_sitelib}/qubesimgconverter-%{version}-py?.?.egg-info
 
-%if 0%{?rhel} >= 7
-%files -n python34-qubesimgconverter
-%else
-%files -n python3-qubesimgconverter
-%endif
+%files -n python%{python3_pkgversion}-qubesimgconverter
 %{python3_sitelib}/qubesimgconverter/__init__.py
 %{python3_sitelib}/qubesimgconverter/imggen.py
 %{python3_sitelib}/qubesimgconverter/test.py

From 2b8411346f12a9abfce4385449456e7066c6a30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Tue, 4 Jun 2019 23:59:51 +0200
Subject: [PATCH 2/3] travis: switch to xenial

QubesOS/qubes-issues#4613
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0f1573a..55e2c4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: python
 python:
   - '2.7'

From f365d7cce8338f4c34fdb827b08cbd8aed7a016a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Wed, 5 Jun 2019 00:00:53 +0200
Subject: [PATCH 3/3] travis: remove older Fedora releases and add Fedora 30

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55e2c4b..dfffb09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,8 @@ script:
  - test -n "$TESTS_ONLY" || ~/qubes-builder/scripts/travis-build
 env:
  - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc27 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc28 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=fc29 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
+ - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=jessie USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=stretch USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=buster USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1