| |
@@ -1,17 +1,22 @@
|
| |
- %if 0%{?fedora}
|
| |
+ %if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} >= 8 )
|
| |
# Not all python modules are built with Python3 in EPEL
|
| |
%global with_python3 1
|
| |
%endif
|
| |
|
| |
Name: module-build-service
|
| |
Version: 3.8.0
|
| |
- Release: 3%{?dist}
|
| |
+ Release: 7%{?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
|
| |
+ %if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} >= 8 )
|
| |
+ # https://pagure.io/fm-orchestrator/pull-request/1767
|
| |
Patch0: mbs_fedora_click.patch
|
| |
+ # https://pagure.io/fm-orchestrator/pull-request/1769
|
| |
+ Patch1: mbs_rem_reqs.patch
|
| |
+ %endif
|
| |
|
| |
BuildArch: noarch
|
| |
|
| |
@@ -25,7 +30,6 @@
|
| |
BuildRequires: python3-setuptools
|
| |
BuildRequires: python3-m2crypto
|
| |
BuildRequires: python3-munch
|
| |
- BuildRequires: python3-funcsigs
|
| |
BuildRequires: python3-solv
|
| |
BuildRequires: python3-libmodulemd
|
| |
BuildRequires: python3-openidc-client
|
| |
@@ -60,7 +64,6 @@
|
| |
BuildRequires: python-munch
|
| |
BuildRequires: python2-funcsigs
|
| |
BuildRequires: python2-solv
|
| |
- BuildRequires: python2-libmodulemd
|
| |
BuildRequires: python-openidc-client
|
| |
BuildRequires: python-ldap3
|
| |
BuildRequires: python-enum34
|
| |
@@ -83,6 +86,8 @@
|
| |
BuildRequires: python-dogpile-cache
|
| |
BuildRequires: python-backports-ssl_match_hostname
|
| |
BuildRequires: python-requests
|
| |
+ # On RHEL7 python2-libmodulemd is packaged as python2-libmodulemd2
|
| |
+ BuildRequires: python2-libmodulemd2
|
| |
%else
|
| |
BuildRequires: python2-setuptools
|
| |
BuildRequires: python2-flask-sqlalchemy
|
| |
@@ -98,6 +103,7 @@
|
| |
BuildRequires: python2-m2crypto
|
| |
BuildRequires: python2-kobo
|
| |
BuildRequires: python2-kobo-rpmlib
|
| |
+ BuildRequires: python2-libmodulemd
|
| |
# python2-pungi is not available in EPEL and can't be a BuildRequire for RHEL
|
| |
BuildRequires: python2-pungi
|
| |
%endif
|
| |
@@ -112,7 +118,6 @@
|
| |
%if 0%{?with_python3}
|
| |
Requires: python3-click
|
| |
Requires: python3-munch
|
| |
- Requires: python3-funcsigs
|
| |
Requires: python3-openidc-client
|
| |
Requires: python3-ldap3
|
| |
Requires: python3-libmodulemd
|
| |
@@ -142,7 +147,6 @@
|
| |
Requires: python-enum34
|
| |
Requires: python-openidc-client
|
| |
Requires: python-ldap3
|
| |
- Requires: python2-libmodulemd
|
| |
Requires: python2-solv
|
| |
Requires: python2-koji
|
| |
Requires: python2-fedmsg
|
| |
@@ -162,6 +166,8 @@
|
| |
Requires: python-dogpile-cache
|
| |
Requires: python-backports-ssl_match_hostname
|
| |
Requires: python-requests
|
| |
+ # On RHEL7 python2-libmodulemd is packaged as python2-libmodulemd2
|
| |
+ Requires: python2-libmodulemd2
|
| |
%else
|
| |
Requires: python2-flask-sqlalchemy
|
| |
Requires: python2-flask-migrate
|
| |
@@ -176,6 +182,7 @@
|
| |
Requires: python2-m2crypto
|
| |
Requires: python2-kobo
|
| |
Requires: python2-kobo-rpmlib
|
| |
+ Requires: python2-libmodulemd
|
| |
%endif
|
| |
|
| |
%endif
|
| |
@@ -205,7 +212,10 @@
|
| |
|
| |
%prep
|
| |
%setup -q
|
| |
+ %if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} >= 8 )
|
| |
%patch0 -p1
|
| |
+ %patch1 -p1
|
| |
+ %endif
|
| |
|
| |
|
| |
# Workaround because python2-koji has no egg-info file at the momement
|
| |
@@ -272,6 +282,7 @@
|
| |
%else
|
| |
%exclude %{python2_sitelib}/conf/
|
| |
%exclude %{python2_sitelib}/tests/
|
| |
+ %exclude %{_sysconfdir}/fedmsg.d/*.py[co]
|
| |
%endif
|
| |
|
| |
%if 0%{?fedora}
|
| |
@@ -279,6 +290,20 @@
|
| |
%endif
|
| |
|
| |
%changelog
|
| |
+ * Tue Apr 4 2023 Diego Herrera <dherrera@redhat.com> - 3.8.0-7
|
| |
+ - Remove unneeded requirements from requirements.txt
|
| |
+
|
| |
+ * Wed Mar 1 2023 Diego Herrera <dherrera@redhat.com> - 3.8.0-6
|
| |
+ - Remove the python3-funcsigs requirement
|
| |
+
|
| |
+ * Wed Feb 15 2023 Diego Herrera <dherrera@redhat.com> - 3.8.0-5
|
| |
+ - Exclude mbs patch on EPEL7
|
| |
+
|
| |
+ * Tue Jan 24 2023 Diego Herrera <dherrera@redhat.com> - 3.8.0-4
|
| |
+ - EPEL8+ uses python3
|
| |
+ - Fix libmodulemd dependency on RHEL7
|
| |
+ - Exclude precompiled python files from config on python2
|
| |
+
|
| |
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-3
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
| |
|
| |
dherrera
commented a year ago
I fixed the python2 filters and dependencies so that the spec file works for EPEL7
With the proper dependencies packaged it should also help this to work on EPEL8 and EPEL9
update 2023/03/01