From e9c9ab22c4907588a5ccfb0ac65538ce9842a50e Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mar 01 2018 04:55:50 +0000 Subject: Update Python 2 dependency declarations to new packaging standards --- diff --git a/pagure.spec b/pagure.spec index 8394d71..e7a81bd 100644 --- a/pagure.spec +++ b/pagure.spec @@ -3,7 +3,7 @@ Name: pagure Version: 3.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A git-centered forge License: GPLv2+ @@ -14,73 +14,73 @@ BuildArch: noarch BuildRequires: systemd-devel BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python-nose - -BuildRequires: py-bcrypt -BuildRequires: python-alembic -BuildRequires: python-arrow -BuildRequires: python-binaryornot -BuildRequires: python-bleach -BuildRequires: python-blinker -BuildRequires: python-celery -BuildRequires: python-chardet -BuildRequires: python-cryptography -BuildRequires: python-docutils -BuildRequires: python-flask -BuildRequires: python-flask-wtf -BuildRequires: python-flask-multistatic -BuildRequires: python-markdown -BuildRequires: python-psutil -BuildRequires: python-pygit2 >= 0.20.1 -BuildRequires: python-pygments -BuildRequires: python-fedora -BuildRequires: python-openid -BuildRequires: python-openid-cla -BuildRequires: python-openid-teams -BuildRequires: python-straight-plugin -BuildRequires: python-wtforms -BuildRequires: python-munch -BuildRequires: python-enum34 -BuildRequires: python-redis +BuildRequires: python2-setuptools +BuildRequires: python2-nose + +BuildRequires: python2-bcrypt +BuildRequires: python2-alembic +BuildRequires: python2-arrow +BuildRequires: python2-binaryornot +BuildRequires: python2-bleach +BuildRequires: python2-blinker +BuildRequires: python2-celery +BuildRequires: python2-chardet +BuildRequires: python2-cryptography +BuildRequires: python2-docutils +BuildRequires: python2-flask +BuildRequires: python2-flask-wtf +BuildRequires: python2-flask-multistatic +BuildRequires: python2-markdown +BuildRequires: python2-psutil +BuildRequires: python2-pygit2 >= 0.20.1 +BuildRequires: python2-pygments +BuildRequires: python2-fedora +BuildRequires: python2-openid +BuildRequires: python2-openid-cla +BuildRequires: python2-openid-teams +BuildRequires: python2-straight-plugin +BuildRequires: python2-wtforms +BuildRequires: python2-munch +BuildRequires: python2-enum34 +BuildRequires: python2-redis # EPEL6 %if ( 0%{?rhel} && 0%{?rhel} == 6 ) BuildRequires: python-sqlalchemy0.8 Requires: python-sqlalchemy0.8 %else -BuildRequires: python-sqlalchemy > 0.8 -Requires: python-sqlalchemy > 0.8 +BuildRequires: python2-sqlalchemy > 0.8 +Requires: python2-sqlalchemy > 0.8 BuildRequires: systemd %endif -Requires: py-bcrypt -Requires: python-alembic -Requires: python-arrow -Requires: python-binaryornot -Requires: python-bleach -Requires: python-blinker -Requires: python-celery -Requires: python-chardet -Requires: python-cryptography -Requires: python-docutils -Requires: python-enum34 -Requires: python-flask -Requires: python-flask-wtf -Requires: python-flask-multistatic -Requires: python-markdown -Requires: python-psutil -Requires: python-pygit2 >= 0.20.1 -Requires: python-pygments -Requires: python-fedora -Requires: python-openid -Requires: python-openid-cla -Requires: python-openid-teams -Requires: python-straight-plugin -Requires: python-wtforms -Requires: python-munch -Requires: python-redis -Requires: mod_wsgi +Requires: python2-bcrypt +Requires: python2-alembic +Requires: python2-arrow +Requires: python2-binaryornot +Requires: python2-bleach +Requires: python2-blinker +Requires: python2-celery +Requires: python2-chardet +Requires: python2-cryptography +Requires: python2-docutils +Requires: python2-enum34 +Requires: python2-flask +Requires: python2-flask-wtf +Requires: python2-flask-multistatic +Requires: python2-markdown +Requires: python2-psutil +Requires: python2-pygit2 >= 0.20.1 +Requires: python2-pygments +Requires: python2-fedora +Requires: python2-openid +Requires: python2-openid-cla +Requires: python2-openid-teams +Requires: python2-straight-plugin +Requires: python2-wtforms +Requires: python2-munch +Requires: python2-redis +Requires: python2-mod_wsgi %{?systemd_requires} @@ -99,7 +99,7 @@ create/merge pull-requests across or within projects. Summary: Milter to integrate pagure with emails BuildArch: noarch BuildRequires: systemd-devel -Requires: python-pymilter +Requires: python2-pymilter %{?systemd_requires} # It would work with sendmail but we configure things (like the tempfile) # to work with postfix @@ -114,9 +114,9 @@ Summary: EventSource server for pagure BuildArch: noarch BuildRequires: systemd-devel -Requires: python-redis -Requires: python-trollius -Requires: python-trollius-redis +Requires: python2-redis +Requires: python2-trollius +Requires: python2-trollius-redis %{?systemd_requires} %description ev Pagure comes with an eventsource server allowing live update of the pages @@ -128,9 +128,9 @@ Summary: Web-Hook server for pagure BuildArch: noarch BuildRequires: systemd-devel -Requires: python-redis -Requires: python-trollius -Requires: python-trollius-redis +Requires: python2-redis +Requires: python2-trollius +Requires: python2-trollius-redis %{?systemd_requires} %description webhook Pagure comes with an webhook server allowing http callbacks for any action @@ -142,10 +142,10 @@ Summary: A CI service for pagure BuildArch: noarch BuildRequires: systemd-devel -Requires: python-redis -Requires: python-trollius -Requires: python-trollius-redis -Requires: python-jenkins +Requires: python2-redis +Requires: python2-trollius +Requires: python2-trollius-redis +Requires: python2-jenkins %{?systemd_requires} %description ci Pagure comes with a continuous integration service, currently supporting @@ -159,9 +159,9 @@ Summary: The logcom service for pagure BuildArch: noarch BuildRequires: systemd-devel -Requires: python-redis -Requires: python-trollius -Requires: python-trollius-redis +Requires: python2-redis +Requires: python2-trollius +Requires: python2-trollius-redis %{?systemd_requires} %description logcom pagure-logcom contains the service that logs commits into the database so that @@ -173,9 +173,9 @@ Summary: The loadjson service for pagure BuildArch: noarch BuildRequires: systemd-devel -Requires: python-redis -Requires: python-trollius -Requires: python-trollius-redis +Requires: python2-redis +Requires: python2-trollius +Requires: python2-trollius-redis %{?systemd_requires} %description loadjson pagure-loadjson is the service allowing to update the database with the @@ -374,6 +374,10 @@ install -p -m 644 pagure-loadjson/pagure_loadjson.service \ %changelog +* Thu Mar 01 2018 Iryna Shcherbina - 3.13.2-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Thu Feb 08 2018 Fedora Release Engineering - 3.13.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild