#139 update RPM dependencies for new Python naming guidelines
Closed 2 years ago by dcallagh. Opened 2 years ago by dcallagh.
dcallagh/waiverdb rpm-python2-dep-renames  into  master

file modified
+7 -11
@@ -13,14 +13,14 @@ 

  %if 0%{?fedora} || 0%{?rhel} > 7

  BuildRequires:  python2-setuptools

  BuildRequires:  python2-sphinx

- BuildRequires:  python-sphinxcontrib-httpdomain

+ BuildRequires:  python2-sphinxcontrib-httpdomain

+ %if 0%{?fedora} >= 27

+ BuildRequires:  python2-sphinxcontrib-issuetracker

+ %else # old name

  BuildRequires:  python-sphinxcontrib-issuetracker

+ %endif

You can do this instead and lose the if statement:

BuildRequires: %{py2_dist sphinxcontrib-issuetracker}

Oh right, that will just produce python2dist(sphinxcontrib-issuetracker) ? Do those python*dist virtual provides now exist on all Fedora releases though?

  BuildRequires:  python2-flask

- %if 0%{?fedora} > 25

  BuildRequires:  python2-sqlalchemy

- %else

- BuildRequires:  python-sqlalchemy

- %endif

  BuildRequires:  python2-flask-restful

  BuildRequires:  python2-flask-sqlalchemy

  BuildRequires:  python2-psycopg2
@@ -32,7 +32,7 @@ 

  BuildRequires:  python2-configparser

  BuildRequires:  python2-click

  BuildRequires:  python2-flask-migrate

- BuildRequires:  stomppy

+ BuildRequires:  python2-stomppy

  %else # EPEL7 uses python- naming

  BuildRequires:  python-setuptools

  BuildRequires:  python-flask
@@ -56,11 +56,7 @@ 

  BuildArch:      noarch

  %if 0%{?fedora} || 0%{?rhel} > 7

  Requires:       python2-flask

- %if 0%{?fedora} > 25

  Requires:       python2-sqlalchemy

- %else

- Requires:       python-sqlalchemy

- %endif

  Requires:       python2-flask-restful

  Requires:       python2-flask-sqlalchemy

  Requires:       python2-psycopg2
@@ -71,7 +67,7 @@ 

  Requires:       python2-click

  Requires:       python2-configparser

  Requires:       python2-flask-migrate

- Requires:       stomppy

+ Requires:       python2-stomppy

  %else

  Requires:       python-flask

  Requires:       python-sqlalchemy

Originally posted as:
https://src.fedoraproject.org/rpms/waiverdb/pull-request/1
as part of:
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3

This patch adds conditionals for the various releases where the package
names changed, so that we can continue to use a single .spec file across
all releases.

You can do this instead and lose the if statement:

BuildRequires: %{py2_dist sphinxcontrib-issuetracker}

Oh right, that will just produce python2dist(sphinxcontrib-issuetracker) ? Do those python*dist virtual provides now exist on all Fedora releases though?

Anyway, it's a moot point... I totally forgot this PR was still open. It's irrelevant now because we have just switched entirely to Python 3 (except the CLI for EPEL7).

:tada:

Pull-Request has been closed by dcallagh

2 years ago

Build 31abbf8b988d43f5fc3d5420e124c35ab187e208 FAILED!
Rebase or make new commits to rebuild.

Metadata