From fe6b7b47210cc431a0b73a20fd114060cedd682e Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Mar 02 2018 03:12:58 +0000 Subject: [PATCH 1/2] Fedora 25 is EOL now, drop conditionals from spec --- diff --git a/waiverdb.spec b/waiverdb.spec index d9b7c6d..22d9464 100644 --- a/waiverdb.spec +++ b/waiverdb.spec @@ -16,11 +16,7 @@ BuildRequires: python2-sphinx BuildRequires: python-sphinxcontrib-httpdomain BuildRequires: python-sphinxcontrib-issuetracker 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 @@ -56,11 +52,7 @@ BuildRequires: systemd 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 From 31abbf8b988d43f5fc3d5420e124c35ab187e208 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Mar 02 2018 03:18:14 +0000 Subject: [PATCH 2/2] update RPM dependencies for new Python naming guidelines 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. --- diff --git a/waiverdb.spec b/waiverdb.spec index 22d9464..89b808e 100644 --- a/waiverdb.spec +++ b/waiverdb.spec @@ -13,8 +13,12 @@ BuildRequires: python2-devel %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 BuildRequires: python2-flask BuildRequires: python2-sqlalchemy BuildRequires: python2-flask-restful @@ -28,7 +32,7 @@ BuildRequires: python2-flask-oidc 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 @@ -63,7 +67,7 @@ Requires: python2-flask-oidc Requires: python2-click Requires: python2-configparser Requires: python2-flask-migrate -Requires: stomppy +Requires: python2-stomppy %else Requires: python-flask Requires: python-sqlalchemy