#7 Enable python dependency generator
Closed 3 years ago by bowlofeggs. Opened 3 years ago by ignatenkobrain.
rpms/ ignatenkobrain/bodhi barani  into  master

file modified
+13 -52
@@ -1,17 +1,19 @@ 

  %global bashcompdir     %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)

  %global bashcomproot    %(dirname %{bashcompdir} 2>/dev/null)

+ %{?python_enable_dependency_generator}

  

  Name:           bodhi

  Version:        3.12.0

- Release:        100%{?dist}

+ Release:        101%{?dist}

  BuildArch:      noarch

  

  License:        GPLv2+

  Summary:        A modular framework that facilitates publishing software updates

- Group:          Applications/Internet

  URL:            https://github.com/fedora-infra/bodhi

  Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

  

+ BuildRequires: python2-devel

+ BuildRequires: python2-setuptools

  BuildRequires: %{py2_dist click}

  BuildRequires: %{py2_dist iniparse}

  BuildRequires: %{py2_dist mock}
@@ -19,6 +21,8 @@ 

  BuildRequires: %{py2_dist pytest-cov}

  BuildRequires: %{py2_dist pytest}

  BuildRequires: %{py2_dist python-fedora} >= 0.9

+ BuildRequires: python3-devel

+ BuildRequires: python3-setuptools

  BuildRequires: %{py3_dist alembic}

  BuildRequires: %{py3_dist arrow}

  BuildRequires: %{py3_dist bleach}
@@ -27,6 +31,7 @@ 

  BuildRequires: %{py3_dist cornice_sphinx} >= 0.3

  BuildRequires: %{py3_dist cornice} >= 3.1.0

  BuildRequires: %{py3_dist cryptography}

+ BuildRequires: %{py3_dist dogpile.cache}

  BuildRequires: %{py3_dist fedmsg}

  BuildRequires: %{py3_dist feedgen}

  BuildRequires: %{py3_dist flake8}
@@ -34,6 +39,7 @@ 

  BuildRequires: %{py3_dist jinja2}

  BuildRequires: %{py3_dist kitchen}

  BuildRequires: %{py3_dist markdown}

+ BuildRequires: %{py3_dist pillow}

  BuildRequires: %{py3_dist mock}

  BuildRequires: %{py3_dist pylibravatar}

  BuildRequires: %{py3_dist pyramid-fas-openid}
@@ -54,15 +60,11 @@ 

  BuildRequires: liberation-mono-fonts

  BuildRequires: pkgconfig(bash-completion)

  BuildRequires: pungi >= 4.1.20

- BuildRequires: python2-devel

  BuildRequires: python2-koji

  BuildRequires: python3-createrepo_c

- BuildRequires: python3-devel

  BuildRequires: python3-dnf

- BuildRequires: python3-dogpile-cache

  BuildRequires: python3-koji

  BuildRequires: python3-librepo

- BuildRequires: python3-pillow

  

  

  %description
@@ -77,7 +79,6 @@ 

  

  %package client

  Summary: Bodhi Client

- Group: Applications/Internet

  

  Requires: python3-bodhi-client == %{version}-%{release}

  
@@ -104,7 +105,6 @@ 

  

  %package docs

  Summary: Bodhi documentation

- Group:   Applications/Internet

  

  Requires: filesystem

  
@@ -115,7 +115,6 @@ 

  

  %package -n python2-bodhi

  Summary: Common files shared by bodhi-client and bodhi-server

- Group:   Applications/Internet

  

  %{?python_provide:%python_provide python2-bodhi}

  
@@ -126,7 +125,6 @@ 

  

  %package -n python3-bodhi

  Summary: Common files shared by bodhi-client and bodhi-server

- Group:   Applications/Internet

  

  %{?python_provide:%python_provide python3-bodhi}

  
@@ -138,12 +136,7 @@ 

  %package -n python2-bodhi-client

  Summary: REST API bindings for Python.

  

- Requires: %{py2_dist click}

- Requires: %{py2_dist iniparse}

- Requires: %{py2_dist kitchen}

- Requires: %{py2_dist python-fedora} >= 0.9

- Requires: %{py2_dist six}

- Requires: koji

+ Requires: /usr/bin/koji

  Requires: python2-bodhi == %{version}-%{release}

  Requires: python2-dnf

  Requires: python2-koji
@@ -158,11 +151,6 @@ 

  %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: /usr/bin/koji

  Requires: python3-bodhi == %{version}-%{release}

  Requires: python3-dnf
@@ -177,42 +165,15 @@ 

  

  %package server

  Summary: A modular framework that facilitates publishing software updates

- Group: Applications/Internet

- 

- Requires: %{py3_dist alembic}

- Requires: %{py3_dist arrow}

- Requires: %{py3_dist bleach}

- Requires: %{py3_dist click}

- Requires: %{py3_dist colander}

- Requires: %{py3_dist cornice} >= 3.1.0

- Requires: %{py3_dist cryptography}

- Requires: %{py3_dist fedmsg}

- Requires: %{py3_dist feedgen}

- Requires: %{py3_dist jinja2}

- Requires: %{py3_dist kitchen}

- Requires: %{py3_dist markdown}

- Requires: %{py3_dist psycopg2}

- Requires: %{py3_dist pylibravatar}

- Requires: %{py3_dist pyramid-fas-openid}

- Requires: %{py3_dist pyramid-mako}

- Requires: %{py3_dist pyramid}

- Requires: %{py3_dist python-bugzilla}

- Requires: %{py3_dist python-fedora}

- Requires: %{py3_dist python3-openid}

- Requires: %{py3_dist simplemediawiki}

- Requires: %{py3_dist six}

- Requires: %{py3_dist sqlalchemy}

- Requires: %{py3_dist waitress}

+ 

  Requires: python3-bodhi-client == %{version}-%{release}

  Requires: git

  Requires: httpd

  Requires: intltool

  Requires: liberation-mono-fonts

- Requires: python3-dogpile-cache

  Requires: python3-koji

  Requires: python3-librepo

  Requires: python3-mod_wsgi

- Requires: python3-pillow

  

  Provides:  bundled(aajohan-comfortaa-fonts)

  Provides:  bundled(abattis-cantarell-fonts)
@@ -246,9 +207,6 @@ 

  sed -i '/pyramid_debugtoolbar/d' setup.py

  sed -i '/pyramid_debugtoolbar/d' devel/development.ini.example

  

- # Kill this from the egg-info deps so that bodhi-server doesn't demand it.

- sed -i '/click/d' setup.py

- 

  # The unit tests needs a development.ini

  mv devel/development.ini.example development.ini

  
@@ -405,6 +363,9 @@ 

  

  

  %changelog

+ * Thu Dec 20 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.12.0-101

+ - Enable dependency generator

+ 

  * Mon Dec 17 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.12.0-100

  - Upgrade to 3.12.0.

  - https://github.com/fedora-infra/bodhi/releases/tag/3.12.0

no initial comment

Sorry it's taken me so long to look at this. I'm going to rebase it and remove the python2 related lines (we just dropped Python 2 entirely, finally!).

Pull-Request has been closed by bowlofeggs

3 years ago