From 9e1505df56ff2a6911cf2a49a52fdfebffea36e2 Mon Sep 17 00:00:00 2001 From: Eli Young Date: Jun 27 2018 00:01:38 +0000 Subject: Update remaining python2 requirements for F27 Fedora 27 now has python2-parsedatetime and python2-pytz. --- diff --git a/certbot.spec b/certbot.spec index e550ffb..ab100e4 100644 --- a/certbot.spec +++ b/certbot.spec @@ -9,7 +9,7 @@ Name: certbot Version: 0.25.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A free, automated certificate authority client License: ASL 2.0 @@ -35,27 +35,22 @@ BuildRequires: python2-pyrfc3339 BuildRequires: pytest BuildRequires: python-configobj BuildRequires: python-devel +BuildRequires: python-parsedatetime BuildRequires: python-setuptools BuildRequires: python-zope-component BuildRequires: python-zope-interface +BuildRequires: pytz %else BuildRequires: python2-configobj BuildRequires: python2-devel +BuildRequires: python2-parsedatetime BuildRequires: python2-pytest +BuildRequires: python2-pytz BuildRequires: python2-setuptools BuildRequires: python2-zope-component BuildRequires: python2-zope-interface %endif -%if 0%{?fedora} > 27 -# Fedora 28 added versioned names to these packages -BuildRequires: python2-parsedatetime -BuildRequires: python2-pytz -%else -BuildRequires: python-parsedatetime -BuildRequires: pytz -%endif - # TODO Remove this once python-parsedatetime adds it as a dependency BuildRequires: python2-future @@ -124,25 +119,20 @@ Requires: python2-future %if 0%{?rhel} && 0%{?rhel} <= 7 # EL7 has unversioned names for these packages Requires: python-configobj +Requires: python-parsedatetime Requires: python-setuptools Requires: python-zope-component Requires: python-zope-interface +Requires: pytz %else Requires: python2-configobj +Requires: python2-parsedatetime +Requires: python2-pytz Requires: python2-setuptools Requires: python2-zope-component Requires: python2-zope-interface %endif -%if 0%{?fedora} > 27 -# Fedora 28 added versioned names to these packages -Requires: python2-parsedatetime -Requires: python2-pytz -%else -Requires: python-parsedatetime -Requires: pytz -%endif - Obsoletes: python2-%{oldpkg} < 0.6.0 Provides: python2-%{oldpkg} = %{version}-%{release} Obsoletes: python-%{oldpkg} < 0.6.0 @@ -262,6 +252,9 @@ restorecon -R %{_sysconfdir}/letsencrypt || : %endif %changelog +* Wed Jun 27 2018 Eli Young - 0.25.1-4 +- Update remaining python2 requirements for F27 + * Tue Jun 19 2018 Miro HronĨok - 0.25.1-3 - Rebuilt for Python 3.7