Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Merlin Mathesius
d8768a3bb5 Rollback EL6 to upstream release 45.0 due to dropped support for python 2.6. 2017-03-07 11:49:35 -06:00
3 changed files with 7 additions and 89 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/avocado-43.0.tar.gz
/avocado-46.0.tar.gz
/avocado-45.0.tar.gz

View file

@ -23,8 +23,8 @@
%global with_tests 0
Name: python-%{srcname}
Version: 46.0
Release: 2%{?gitrel}%{?dist}
Version: 45.0
Release: 1%{?gitrel}%{?dist}
Summary: Framework with tools and libraries for Automated Testing
Group: Development/Tools
# Found licenses:
@ -145,46 +145,6 @@ directory. It also gives the user the ability to write a report on an
arbitrary filesystem location.
%package -n python2-%{srcname}-plugins-runner-remote
Summary: Avocado Runner for Remote Execution
%{?python_provide:%python_provide python2-%{srcname}-plugins-runner-remote}
Requires: python2-%{srcname} == %{version}-%{release}
Requires: fabric
%if 0%{?fedora} == 24
Requires: python-crypto
%endif
%description -n python2-%{srcname}-plugins-runner-remote
Allows Avocado to run jobs on a remote machine, by means of an SSH
connection. Avocado must be previously installed on the remote machine.
%package -n python2-%{srcname}-plugins-runner-vm
Summary: Avocado Runner for libvirt VM Execution
%{?python_provide:%python_provide python2-%{srcname}-plugins-runner-vm}
Requires: python2-%{srcname} == %{version}-%{release}
Requires: python2-%{srcname}-plugins-runner-remote == %{version}-%{release}
Requires: libvirt-python
%description -n python2-%{srcname}-plugins-runner-vm
Allows Avocado to run jobs on a libvirt based VM, by means of
interaction with a libvirt daemon and an SSH connection to the VM
itself. Avocado must be previously installed on the VM.
%package -n python2-%{srcname}-plugins-runner-docker
Summary: Avocado Runner for Execution on Docker Containers
%{?python_provide:%python_provide python2-%{srcname}-plugins-runner-docker}
Requires: python2-%{srcname} == %{version}-%{release}
Requires: python2-%{srcname}-plugins-runner-remote == %{version}-%{release}
Requires: python2-aexpect
%description -n python2-%{srcname}-plugins-runner-docker
Allows Avocado to run jobs on a Docker container by interacting with a
Docker daemon and attaching to the container itself. Avocado must
be previously installed on the container.
%package -n python-%{srcname}-examples
Summary: Avocado Test Framework Example Tests
License: GPLv2
@ -203,25 +163,12 @@ examples of how to write tests on your own.
%else
%setup -q -n %{srcname}-%{commit}
%endif
# package plugins-runner-vm requires libvirt-python, but the RPM
# version of libvirt-python does not publish the egg info and this
# causes that dep to be attempted to be installed by pip
sed -e "s/'libvirt-python'//" -i optional_plugins/runner_vm/setup.py
%build
%{__python2} setup.py build
pushd optional_plugins/html
%{__python2} setup.py build
popd
pushd optional_plugins/runner_remote
%{__python} setup.py build
popd
pushd optional_plugins/runner_vm
%{__python} setup.py build
popd
pushd optional_plugins/runner_docker
%{__python} setup.py build
popd
%{__make} man
%install
@ -229,15 +176,6 @@ popd
pushd optional_plugins/html
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/runner_remote
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/runner_vm
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/runner_docker
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
%{__mkdir_p} %{buildroot}%{_mandir}/man1
%{__install} -m 0644 man/avocado.1 %{buildroot}%{_mandir}/man1/avocado.1
%{__install} -m 0644 man/avocado-rest-client.1 %{buildroot}%{_mandir}/man1/avocado-rest-client.1
@ -254,15 +192,6 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
pushd optional_plugins/html
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_remote
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_vm
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_docker
%{__python2} setup.py develop --user
popd
selftests/run
%endif
@ -306,27 +235,15 @@ selftests/run
%{python2_sitelib}/avocado_result_html-%{version}-py%{python2_version}.egg-info
%files -n python2-%{srcname}-plugins-runner-remote
%{python2_sitelib}/avocado_runner_remote/
%{python2_sitelib}/avocado_runner_remote-%{version}-py%{python2_version}.egg-info
%files -n python2-%{srcname}-plugins-runner-vm
%{python2_sitelib}/avocado_runner_vm/
%{python2_sitelib}/avocado_runner_vm-%{version}-py%{python2_version}.egg-info
%files -n python2-%{srcname}-plugins-runner-docker
%{python2_sitelib}/avocado_runner_docker/
%{python2_sitelib}/avocado_runner_docker-%{version}-py%{python2_version}.egg-info
%files -n python-%{srcname}-examples
%dir %{_docdir}/avocado
%{_docdir}/avocado/tests
%{_docdir}/avocado/wrappers
%changelog
* Tue Mar 07 2017 Merlin Mathesius <mmathesi@redhat.com> - 45.0-1
- Rollback EL6 to upstream release 45.0 due to dropped support for python 2.6.
* Mon Feb 27 2017 Merlin Mathesius <mmathesi@redhat.com> - 46.0-2
- Incorporate upstream SPEC file changes to split plugins into subpackages.
- Remove obsolete CC-BY-SA license, which went away with the halflings font.

View file

@ -1 +1 @@
SHA512 (avocado-46.0.tar.gz) = f3e3c1109803da79e2a15e7e02d7b843f8604a592f81fd8075081e61bdd9059c2c02a1f0333479a2bb09dcc7c13b4104a3e02686d96937c69bc6c2c0d41524da
SHA512 (avocado-45.0.tar.gz) = b224430e5fe70dc8bc4e9b04fa6c8eb7417c7915f039238b2322032fdc400f16aaedb67487e97b942894ecba966143431f99b050f6e22290fabe6c658b105a43