| |
@@ -23,6 +23,7 @@
|
| |
BuildRequires: %{py2_dist cornice_sphinx} >= 0.3
|
| |
BuildRequires: %{py2_dist cornice} >= 3.1.0
|
| |
BuildRequires: %{py2_dist cryptography}
|
| |
+ BuildRequires: %{py2_dist fedmsg}
|
| |
BuildRequires: %{py2_dist feedgen}
|
| |
BuildRequires: %{py2_dist flake8}
|
| |
BuildRequires: %{py2_dist iniparse}
|
| |
@@ -48,8 +49,38 @@
|
| |
BuildRequires: %{py2_dist sqlalchemy}
|
| |
BuildRequires: %{py2_dist virtualenv}
|
| |
BuildRequires: %{py2_dist webtest}
|
| |
- BuildRequires: createrepo_c
|
| |
- BuildRequires: fedmsg
|
| |
+ BuildRequires: %{py3_dist alembic}
|
| |
+ BuildRequires: %{py3_dist arrow}
|
| |
+ BuildRequires: %{py3_dist bleach}
|
| |
+ BuildRequires: %{py3_dist click}
|
| |
+ BuildRequires: %{py3_dist colander}
|
| |
+ BuildRequires: %{py3_dist cornice_sphinx} >= 0.3
|
| |
+ BuildRequires: %{py3_dist cornice} >= 3.1.0
|
| |
+ BuildRequires: %{py3_dist cryptography}
|
| |
+ BuildRequires: %{py3_dist fedmsg}
|
| |
+ BuildRequires: %{py3_dist feedgen}
|
| |
+ BuildRequires: %{py3_dist flake8}
|
| |
+ BuildRequires: %{py3_dist iniparse}
|
| |
+ BuildRequires: %{py3_dist jinja2}
|
| |
+ BuildRequires: %{py3_dist kitchen}
|
| |
+ BuildRequires: %{py3_dist markdown}
|
| |
+ BuildRequires: %{py3_dist mock}
|
| |
+ BuildRequires: %{py3_dist pylibravatar}
|
| |
+ BuildRequires: %{py3_dist pyramid-fas-openid}
|
| |
+ BuildRequires: %{py3_dist pyramid-mako}
|
| |
+ BuildRequires: %{py3_dist pyramid-tm}
|
| |
+ BuildRequires: %{py3_dist pyramid}
|
| |
+ BuildRequires: %{py3_dist pytest-cov}
|
| |
+ BuildRequires: %{py3_dist pytest}
|
| |
+ BuildRequires: %{py3_dist python-bugzilla}
|
| |
+ BuildRequires: %{py3_dist python-fedora}
|
| |
+ BuildRequires: %{py3_dist pyyaml}
|
| |
+ BuildRequires: %{py3_dist responses}
|
| |
+ BuildRequires: %{py3_dist simplemediawiki}
|
| |
+ BuildRequires: %{py3_dist sphinx}
|
| |
+ BuildRequires: %{py3_dist sqlalchemy}
|
| |
+ BuildRequires: %{py3_dist webtest}
|
| |
+ BuildRequires: /usr/bin/virtualenv
|
| |
BuildRequires: koji
|
| |
BuildRequires: liberation-mono-fonts
|
| |
BuildRequires: packagedb-cli
|
| |
@@ -61,6 +92,13 @@
|
| |
BuildRequires: python2-koji
|
| |
BuildRequires: python2-librepo
|
| |
BuildRequires: python2-pillow
|
| |
+ BuildRequires: python3-createrepo_c
|
| |
+ BuildRequires: python3-devel
|
| |
+ BuildRequires: python3-dnf
|
| |
+ BuildRequires: python3-dogpile-cache
|
| |
+ BuildRequires: python3-koji
|
| |
+ BuildRequires: python3-librepo
|
| |
+ BuildRequires: python3-pillow
|
| |
|
| |
|
| |
%description
|
| |
@@ -88,6 +126,7 @@
|
| |
Requires: python2-dnf
|
| |
Requires: python2-koji
|
| |
|
| |
+ Provides: python2-bodhi-client = %{version}-%{release}
|
| |
|
| |
%description client
|
| |
Client tools for interacting with bodhi.
|
| |
@@ -113,6 +152,37 @@
|
| |
Common files shared by bodhi-client and bodhi-server.
|
| |
|
| |
|
| |
+ %package -n python3-bodhi
|
| |
+ Summary: Common files shared by bodhi-client and bodhi-server
|
| |
+ Group: Applications/Internet
|
| |
+
|
| |
+ %{?python_provide:%python_provide python3-bodhi}
|
| |
+
|
| |
+
|
| |
+ %description -n python3-bodhi
|
| |
+ Common files shared by bodhi-client and bodhi-server.
|
| |
+
|
| |
+
|
| |
+ %package -n python3-bodhi-client
|
| |
+ Summary: REST API bindings for Python.
|
| |
+
|
| |
+ Requires: %{py3_dist click}
|
| |
+ Requires: %{py3_dist iniparse}
|
| |
+ Requires: %{py3_dist kitchen}
|
| |
+ Requires: %{py3_dist python-fedora} >= 0.9
|
| |
+ Requires: %{py3_dist six}
|
| |
+ Requires: koji
|
| |
+ Requires: python3-bodhi == %{version}-%{release}
|
| |
+ Requires: python3-dnf
|
| |
+ Requires: python3-koji
|
| |
+
|
| |
+ %{?python_provide:%python_provide python3-bodhi-client}
|
| |
+
|
| |
+
|
| |
+ %description -n python3-bodhi-client
|
| |
+ REST API bindings for Python.
|
| |
+
|
| |
+
|
| |
%package server
|
| |
Summary: A modular framework that facilitates publishing software updates
|
| |
Group: Applications/Internet
|
| |
@@ -200,6 +270,8 @@
|
| |
|
| |
|
| |
%build
|
| |
+ # To preserve Py2 as default for F28, build Python 3 first and then overwrite it with Python 2
|
| |
+ %py3_build
|
| |
%py2_build
|
| |
|
| |
make %{?_smp_mflags} -C docs html
|
| |
@@ -207,6 +279,10 @@
|
| |
|
| |
|
| |
%install
|
| |
+ %py3_install
|
| |
+ # We aren't ready to support Bodhi server on Python 3 yet, so let's just nuke it for now.
|
| |
+ rm -rf %{buildroot}/usr/lib/python%{python3_version}/site-packages/bodhi/server/
|
| |
+ rm -rf %{buildroot}/usr/lib/python%{python3_version}/site-packages/bodhi_server-*.egg-info
|
| |
%py2_install
|
| |
|
| |
%{__mkdir_p} %{buildroot}/var/lib/bodhi
|
| |
@@ -280,6 +356,22 @@
|
| |
%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info
|
| |
|
| |
|
| |
+ %files -n python3-bodhi
|
| |
+ %license COPYING
|
| |
+ %doc README.rst
|
| |
+ %dir %{python3_sitelib}/%{name}/
|
| |
+ %{python3_sitelib}/%{name}/__init__.py
|
| |
+ %{python3_sitelib}/%{name}/__pycache__
|
| |
+ %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
|
| |
+
|
| |
+
|
| |
+ %files -n python3-bodhi-client
|
| |
+ %license COPYING
|
| |
+ %doc README.rst
|
| |
+ %{python3_sitelib}/%{name}/client
|
| |
+ %{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}.egg-info
|
| |
+
|
| |
+
|
| |
%files server
|
| |
%license COPYING
|
| |
%doc README.rst
|
| |
This introduces 2 new subpackages into f28 branch:
And one new provide:
* bodhi-client provides python2-bodhi-client
We need those new subpackages for libtaskotron ( https://pagure.io/taskotron/libtaskotron/issue/426 ) and I assume anybody else who wants to use bodhi in Python 3 in F28 would also welcome this change.