The package rpms/odcs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/odcs.git/commit/?id=ad1c0a9635b91....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit ad1c0a9635b917b7b144508d125842fbb9603e2e
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 08:51:54 2019 +0100
Build only with python3
diff --git a/odcs.spec b/odcs.spec
index 1eb999e..f4a6b25 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -2,10 +2,6 @@
#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
%global _python_bytecompile_extra 1
-%if 0%{?fedora}
-%global with_python3 1
-%endif
-
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %global pyver %(%{__python} -c "import sys ; print
sys.version[:3]")}
%global debug_package %{nil}
@@ -28,83 +24,19 @@ Patch0: odcs-pythonldap.patch
Patch1: odcs-fedora-conf.patch
Patch2: odcs-default-help.patch
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# In EL7 we need flask which needs python-itsdangerous which comes from
-# rhel7-extras which is only available on x86_64 for now.
-ExclusiveArch: %{ix86} x86_64
-%else
BuildArch: noarch
-%endif
-
-BuildRequires: python2-devel
BuildRequires: fedmsg-hub
BuildRequires: help2man
-
-BuildRequires: libmodulemd
+BuildRequires: libmodulemd1
BuildRequires: gobject-introspection
-
BuildRequires: systemd
-
-BuildRequires: python2-devel
-BuildRequires: python2-pdc-client
-BuildRequires: python2-fedora
-BuildRequires: python2-productmd
-BuildRequires: python2-funcsigs
-BuildRequires: python2-modulemd >= 1.1.0
-BuildRequires: python2-openidc-client
-
-%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-pdc-client
BuildRequires: python3-fedora
BuildRequires: python3-productmd
BuildRequires: python3-funcsigs
-BuildRequires: python3-modulemd >= 1.1.0
BuildRequires: python3-openidc-client
-%endif
-
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires: python-setuptools
-BuildRequires: python-flask-sqlalchemy
-BuildRequires: python-flask-migrate
-BuildRequires: python-nose
-BuildRequires: python-mock
-BuildRequires: python-six
-BuildRequires: pyOpenSSL
-BuildRequires: python-sqlalchemy
-BuildRequires: python-futures
-BuildRequires: python-flask
-BuildRequires: systemd-python
-BuildRequires: python-defusedxml
-BuildRequires: koji
-BuildRequires: python-httplib2
-BuildRequires: python-qpid
-BuildRequires: pyOpenSSL
-BuildRequires: python-sqlalchemy
-BuildRequires: python-ldap
-BuildRequires: python-gobject-base
-%else
-BuildRequires: python2-setuptools
-BuildRequires: python2-flask-sqlalchemy
-BuildRequires: python2-flask-migrate
-BuildRequires: python2-nose
-BuildRequires: python2-mock
-BuildRequires: python2-tabulate
-BuildRequires: python2-six
-BuildRequires: python2-futures
-BuildRequires: python2-flask
-BuildRequires: python2-systemd
-BuildRequires: python2-defusedxml
-BuildRequires: python2-koji
-BuildRequires: python2-httplib2
-BuildRequires: python2-qpid
-BuildRequires: python2-pyOpenSSL
-BuildRequires: python2-sqlalchemy
-BuildRequires: python2-ldap
-BuildRequires: python2-gobject-base
-%if 0%{?with_python3}
BuildRequires: python3-setuptools
BuildRequires: python3-flask-sqlalchemy
BuildRequires: python3-flask-migrate
@@ -121,24 +53,9 @@ BuildRequires: python3-pyOpenSSL
BuildRequires: python3-sqlalchemy
BuildRequires: python3-ldap
BuildRequires: python3-gobject-base
-%endif
-%endif
-
-%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
-BuildRequires: python-flask-script
-BuildRequires: python-flask-login
-BuildRequires: python-munch
-%else
-BuildRequires: python2-flask-script
-BuildRequires: python2-flask-login
-BuildRequires: python2-munch
-%if 0%{?with_python3}
BuildRequires: python3-flask-script
BuildRequires: python3-flask-login
BuildRequires: python3-munch
-%endif
-%endif
-
%{?systemd_requires}
@@ -149,61 +66,13 @@ Requires: pungi
Requires: python2-pdc-client
Requires: python2-fedora
Requires: python2-funcsigs
-Requires: python2-modulemd >= 1.1.0
Requires: python2-openidc-client
Requires: python2-productmd
Requires: hardlink
-Requires: libmodulemd
+Requires: libmodulemd1
Requires: gobject-introspection
-%if 0%{?rhel} && 0%{?rhel} <= 7
-Requires: python-flask-sqlalchemy
-Requires: python-flask-migrate
-Requires: python-mock
-Requires: python-six
-Requires: pyOpenSSL
-Requires: python-sqlalchemy
-Requires: python-futures
-Requires: python-flask
-Requires: python-defusedxml
-Requires: koji
-Requires: python-httplib2
-Requires: python-qpid
-Requires: pyOpenSSL
-Requires: python-sqlalchemy
-Requires: python-gobject-base
-
-Requires: systemd-python
-%else
-Requires: python2-flask-sqlalchemy
-Requires: python2-flask-migrate
-Requires: python2-mock
-Requires: python2-systemd
-Requires: python2-six
-Requires: python2-futures
-Requires: python2-flask
-Requires: python2-defusedxml
-Requires: python2-koji
-Requires: python2-httplib2
-Requires: python2-qpid
-Requires: python2-pyOpenSSL
-Requires: python2-sqlalchemy
-Requires: python2-gobject-base
-%endif
-
-%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
-Requires: python-flask-script
-Requires: python-flask-login
-Requires: python-ldap
-Requires: python-munch
-%else
-Requires: python2-flask-script
-Requires: python2-flask-login
-Requires: python2-ldap
-Requires: python2-munch
-%endif
-
-Requires: python2-odcs-common = %{version}-%{release}
+Requires: python3-odcs-common = %{version}-%{release}
%description
@@ -211,35 +80,6 @@ The On Demand Compose Service (ODCS) creates temporary composes using
Pungi
tool and manages their lifetime. The composes can be requested by external
services or users using the REST API provided by Flask frontend.
-%package -n python2-odcs-common
-Summary: ODCS subpackage providing code shared between server and client.
-%{?python_provide:%python_provide python2-odcs-client}
-
-Requires: python2-six
-
-%description -n python2-odcs-common
-ODCS subpackage providing code shared between server and client.
-
-%package -n python2-odcs-client
-Summary: ODCS client module
-%{?python_provide:%python_provide python2-odcs-client}
-
-Requires: python2-six
-
-%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
-Requires: python-requests
-Requires: python-requests-kerberos
-%else
-Requires: python2-requests
-Requires: python2-requests-kerberos
-%endif
-
-Requires: python2-odcs-common = %{version}-%{release}
-
-%description -n python2-odcs-client
-Client library for sending requests to On Demand Compose Service (ODCS).
-
-%if 0%{?with_python3}
%package -n python3-odcs-common
Summary: ODCS subpackage providing code shared between server and client.
%{?python_provide:%python_provide python3-odcs-client}
@@ -260,17 +100,11 @@ Requires: python3-odcs-common = %{version}-%{release}
%description -n python3-odcs-client
Client library for sending requests to On Demand Compose Service (ODCS).
-%endif
%package -n odcs-client
Summary: ODCS command line client
-%if 0%{?with_python3}
Requires: python3-openidc-client
Requires: python3-odcs-client = %{version}-%{release}
-%else
-Requires: python2-openidc-client
-Requires: python2-odcs-client = %{version}-%{release}
-%endif
%description -n odcs-client
Command line client for sending requests to ODCS.
@@ -279,27 +113,22 @@ Command line client for sending requests to ODCS.
%prep
%setup -q
-%if 0%{?with_python3}
sed -i '/futures/d' common/requirements.txt
sed -i '/futures/d' client/requirements.txt
sed -i '/futures/d' server/requirements.txt
-%endif
%patch0 -p1 -b .pyldap
%patch1 -p1
%patch2 -p1
%build
-%py2_build
-%if 0%{?with_python3}
%py3_build
-%endif
%install
-%py2_install
+%py3_install
-export PYTHONPATH=%{buildroot}%{python2_sitelib}
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
mkdir -p %{buildroot}%{_mandir}/man1
for command in odcs-manager odcs-frontend odcs-gencert odcs-upgradedb ; do
export ODCS_CONFIG_FILE=server/conf/config.py
@@ -316,12 +145,6 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
install -d -m 0755 %{buildroot}%{_datadir}/odcs
install -p -m 0644 server/contrib/odcs.wsgi %{buildroot}%{_datadir}/odcs
-%if 0%{?with_python3}
-# Prepare the python3 bits, but remove the server portion. We're just shipping
-# the client as py3 for now.
-%py3_install
-rm -rf %{buildroot}%{python3_sitelib}/odcs/server/
-%endif
%pre
getent group odcs >/dev/null || groupadd -r odcs
@@ -340,34 +163,13 @@ exit 0
%systemd_postun_with_restart odcs-backend.service
%check
-nosetests-2.7 -v
-
-%if 0%{?with_python3}
nosetests-%{python3_version} -v
-%endif
%files -n odcs-client
%doc README.md
%license LICENSE
%{_bindir}/odcs
-%files -n python2-odcs-common
-%doc README.md
-%license LICENSE
-%dir %{python2_sitelib}/odcs/
-%{python2_sitelib}/odcs/__init__.py*
-%{python2_sitelib}/odcs/common/
-%{python2_sitelib}/odcs-%{version}-py%{pyver}.egg-info/
-%exclude %{python2_sitelib}/odcs/__pycache__
-
-%files -n python2-odcs-client
-%doc README.md
-%license LICENSE
-%dir %{python2_sitelib}/odcs/
-%{python2_sitelib}/odcs/client/
-%exclude %{python2_sitelib}/odcs/__pycache__
-
-%if 0%{?with_python3}
%files -n python3-odcs-common
%doc README.md
%license LICENSE
@@ -383,13 +185,12 @@ nosetests-%{python3_version} -v
%dir %{python3_sitelib}/odcs/
%{python3_sitelib}/odcs/client/
%exclude %{python3_sitelib}/odcs/__pycache__
-%endif
%files
%doc README.md
%license LICENSE
%{_unitdir}/odcs-backend.service
-%{python2_sitelib}/odcs/server
+%{python3_sitelib}/odcs/server
%{_bindir}/odcs-*
%{_mandir}/man1/odcs-*.1*
%{_datadir}/odcs
@@ -400,7 +201,7 @@ nosetests-%{python3_version} -v
%config(noreplace) %{_sysconfdir}/odcs/runroot_koji.conf
%{_sysconfdir}/fedmsg.d/*
%exclude %{_sysconfdir}/odcs/*.py[co]
-%exclude %{python2_sitelib}/odcs/__pycache__
+%exclude %{python3_sitelib}/odcs/__pycache__
%changelog