From ae433351d87d922c298d97e23c5a6ec7a67b9d77 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Fri, 3 Feb 2017 08:37:49 -0500 Subject: [PATCH] Python 2.6: remove support for EL6 RPM packages Now that Python 2.6 is not supported anymore, we can not officially support EL6 as a platform for RPM packages. Let's drop all special requirements for that platform. Signed-off-by: Cleber Rosa --- avocado.spec | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/avocado.spec b/avocado.spec index b5be47fb..661ddc2f 100644 --- a/avocado.spec +++ b/avocado.spec @@ -7,24 +7,14 @@ Summary: Framework with tools and libraries for Automated Testing Name: avocado Version: 45.0 -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2 Group: Development/Tools URL: http://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz BuildArch: noarch -Requires: python, python-requests, fabric, pyliblzma, libvirt-python, gdb, gdb-gdbserver, python-stevedore, aexpect -BuildRequires: python2-devel, python-setuptools, python-docutils, python-mock, python-psutil, python-sphinx, python-requests, aexpect, pystache, yum, python-stevedore, python-lxml, perl-Test-Harness, fabric, python-flexmock - -%if 0%{?el6} -Requires: PyYAML -Requires: python-argparse, python-importlib, python-logutils, python-unittest2, procps -BuildRequires: PyYAML -BuildRequires: python-argparse, python-importlib, python-logutils, python-unittest2, procps -%else -Requires: python-yaml, procps-ng -BuildRequires: python-yaml, procps-ng -%endif +Requires: python, python-requests, fabric, pyliblzma, libvirt-python, gdb, gdb-gdbserver, python-stevedore, python-yaml, procps-ng, aexpect +BuildRequires: python2-devel, python-setuptools, python-docutils, python-mock, python-psutil, python-sphinx, python-requests, aexpect, pystache, yum, python-stevedore, python-lxml, perl-Test-Harness, fabric, python-flexmock, python-yaml, procps-ng %if 0%{?fedora} >= 25 BuildRequires: kmod @@ -115,6 +105,9 @@ examples of how to write tests on your own. %{_datadir}/avocado/wrappers %changelog +* Fri Feb 3 2017 Cleber Rosa - 45.0-1 +- Removed support for EL6 requirements + * Tue Jan 17 2017 Cleber Rosa - 45.0-0 - New upstream release -- GitLab