QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/40'

Browse Source 
* origin/pr/40:
  travis: remove older Fedora releases and add Fedora 30
  travis: switch to xenial
  python3: use macro pkgversion
This commit is contained in:
Marek Marczykowski-Górecki 2019-06-05 19:04:23 +02:00
commit 90641b0dce
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -1,5 +1,5 @@
sudo: required sudo: required
dist: trusty dist: xenial
language: python language: python
python: python:
- '2.7' - '2.7'
@ -11,9 +11,8 @@ script:
- test -n "$TESTS_ONLY" || ~/qubes-builder/scripts/travis-build - test -n "$TESTS_ONLY" || ~/qubes-builder/scripts/travis-build
env: env:
- DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1 - 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=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=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=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 - DISTS_VM=buster USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1

42
rpm_spec/qubes-utils.spec.in
View File

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