Sync with upstream release 49.0. (BZ#1431413)

This commit is contained in:
Merlin Mathesius 2017-04-26 15:28:43 -05:00
commit e1beb065de
3 changed files with 36 additions and 4 deletions

View file

@ -10,10 +10,10 @@
%global gittar %{srcname}-%{version}.tar.gz
%else
%if ! 0%{?commit:1}
%global commit 337b333e1b58f18f876c993121454f2f6cb599db
%global commit 77df4ae0cf1d7377d98e2950ec04e08f8f5f31a2
%endif
%if ! 0%{?commit_date:1}
%global commit_date 20170213
%global commit_date 20170424
%endif
%global shortcommit %(c=%{commit};echo ${c:0:7})
%global gitrel .%{commit_date}git%{shortcommit}
@ -27,7 +27,7 @@
%global with_tests 1
Name: python-%{srcname}
Version: 48.0
Version: 49.0
Release: 1%{?gitrel}%{?dist}
Summary: Framework with tools and libraries for Automated Testing
Group: Development/Tools
@ -53,6 +53,7 @@ BuildRequires: python-docutils
BuildRequires: python-flexmock
BuildRequires: python-lxml
BuildRequires: python2-mock
BuildRequires: python-resultsdb_api
%if %{with_tests}
BuildRequires: libvirt-python
@ -190,6 +191,17 @@ Docker daemon and attaching to the container itself. Avocado must
be previously installed on the container.
%package -n python2-%{srcname}-plugins-resultsdb
Summary: Avocado plugin to propagate job results to ResultsDB
%{?python_provide:%python_provide python2-%{srcname}-plugins-resultsdb}
Requires: python2-%{srcname} == %{version}-%{release}
Requires: python-resultsdb_api
%description -n python2-%{srcname}-plugins-resultsdb
Allows Avocado to send job results directly to a ResultsDB
server.
%package -n python-%{srcname}-examples
Summary: Avocado Test Framework Example Tests
License: GPLv2
@ -227,6 +239,9 @@ popd
pushd optional_plugins/runner_docker
%{__python} setup.py build
popd
pushd optional_plugins/resultsdb
%{__python} setup.py build
popd
%{__make} man
%install
@ -243,9 +258,13 @@ popd
pushd optional_plugins/runner_docker
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/resultsdb
%{__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
%{__install} -d -m 0755 %{buildroot}%{_sharedstatedir}/avocado/data
# relocate examples to documentation directory
%{__mkdir_p} %{buildroot}%{_docdir}/avocado
%{__mv} %{buildroot}%{_datadir}/avocado/tests %{buildroot}%{_docdir}/avocado/tests
@ -268,6 +287,9 @@ popd
pushd optional_plugins/runner_docker
%{__python2} setup.py develop --user
popd
pushd optional_plugins/resultsdb
%{__python2} setup.py develop --user
popd
selftests/run
%endif
@ -295,6 +317,7 @@ selftests/run
%{_bindir}/avocado-rest-client
%{_mandir}/man1/avocado.1.gz
%{_mandir}/man1/avocado-rest-client.1.gz
%dir %{_sharedstatedir}/avocado
%dir %{_docdir}/avocado
%{_docdir}/avocado/avocado.rst
%{_docdir}/avocado/avocado-rest-client.rst
@ -326,12 +349,20 @@ selftests/run
%{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info
%files -n python2-%{srcname}-plugins-resultsdb
%{python2_sitelib}/avocado_resultsdb/
%{python2_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python2_version}.egg-info
%files -n python-%{srcname}-examples
%dir %{_docdir}/avocado
%{_docdir}/avocado/tests
%{_docdir}/avocado/wrappers
%changelog
* Tue Apr 25 2017 Merlin Mathesius <mmathesi@redhat.com> - 49.0-1
- Sync with upstream release 49.0. (BZ#1431413)
* Tue Apr 18 2017 Merlin Mathesius <mmathesi@redhat.com> - 48.0-1
- Sync with upstream release 48.0. (BZ#1431413)
- Allow rel_build macro to be defined outside of the SPEC file.