Merge branch 'master' into epel7

This commit is contained in:
mprahl
2019-04-04 13:58:26 -04:00
3 changed files with 11 additions and 6 deletions

1
.gitignore vendored
View File

@@ -74,3 +74,4 @@
/module-build-service-2.13.1.tar.gz
/module-build-service-2.14.0.tar.gz
/module-build-service-2.18.1.tar.gz
/module-build-service-2.19.0.tar.gz

View File

@@ -4,14 +4,13 @@
%endif
Name: module-build-service
Version: 2.18.1
Release: 2%{?dist}
Version: 2.19.0
Release: 1%{?dist}
Summary: The Module Build Service for Modularity
License: MIT
URL: https://pagure.io/fm-orchestrator
Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
Patch0: 1185.patch
BuildArch: noarch
@@ -47,6 +46,7 @@ BuildRequires: python3-kobo-rpmlib
BuildRequires: python3-fedmsg
BuildRequires: python3-pungi
BuildRequires: python3-prometheus_client
BuildRequires: python3-dnf
%else
@@ -65,6 +65,7 @@ BuildRequires: python-enum34
BuildRequires: python2-koji
BuildRequires: python2-fedmsg
BuildRequires: python2-prometheus_client
BuildRequires: python2-dnf
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: python-setuptools
@@ -131,6 +132,7 @@ Requires: python3-requests
Requires: python3-pyOpenSSL
Requires: python3-fedmsg
Requires: python3-prometheus_client
Requires: python3-dnf
%else
Requires: python-flask-script
Requires: python-munch
@@ -144,6 +146,7 @@ Requires: python2-koji
Requires: python2-fedmsg
Requires: python2-pungi
Requires: python2-prometheus_client
Requires: python2-dnf
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: python-flask-sqlalchemy
@@ -202,8 +205,6 @@ for a number of tasks:
%prep
%setup -q
%patch0 -p1
# Workaround because python2-koji has no egg-info file at the momement
sed -i '/koji/d' requirements.txt
@@ -279,6 +280,9 @@ done
%endif
%changelog
* Thu Apr 04 2019 mprahl <mprahl@redhat.com> - 2.19.0-1
- new version
* Wed Mar 27 2019 Jan Kaluza <jkaluza@redhat.com> - 2.18.1-2
- backport PR#1185

View File

@@ -1 +1 @@
SHA512 (module-build-service-2.18.1.tar.gz) = 7a50123c4364328acbe2ae065511b02f01f41814cbaa6f70265e96e4f75552eb9f342064a76700db115132c1a836872b877a7626878279b4d6fd31b262d97efc
SHA512 (module-build-service-2.19.0.tar.gz) = ee36d733097c2eaef9219fe1b0faa177b4e4905a31d9cabc9d468aa2e793d8dae2785d19e4695520e1c37ffa1580e826472241557934d68ab31d130e1975f2a1