Sync with upstream release 48.0. (BZ#1431413)
Allow rel_build macro to be defined outside of the SPEC file.
This commit is contained in:
parent
0e403cc259
commit
5d480f1547
3 changed files with 14 additions and 7 deletions
|
|
@ -1,7 +1,9 @@
|
|||
%global srcname avocado
|
||||
|
||||
# Conditional for release vs. snapshot builds. Set to 1 for release build.
|
||||
%if ! 0%{?rel_build:1}
|
||||
%global rel_build 1
|
||||
%endif
|
||||
|
||||
# Settings used for build from snapshots.
|
||||
%if 0%{?rel_build}
|
||||
|
|
@ -25,7 +27,7 @@
|
|||
%global with_tests 1
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 47.0
|
||||
Version: 48.0
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Summary: Framework with tools and libraries for Automated Testing
|
||||
Group: Development/Tools
|
||||
|
|
@ -248,7 +250,7 @@ popd
|
|||
%{__mkdir_p} %{buildroot}%{_docdir}/avocado
|
||||
%{__mv} %{buildroot}%{_datadir}/avocado/tests %{buildroot}%{_docdir}/avocado/tests
|
||||
%{__mv} %{buildroot}%{_datadir}/avocado/wrappers %{buildroot}%{_docdir}/avocado/wrappers
|
||||
find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x {} ';'
|
||||
find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x {} ';'
|
||||
|
||||
|
||||
%check
|
||||
|
|
@ -306,22 +308,22 @@ selftests/run
|
|||
|
||||
%files -n python2-%{srcname}-plugins-output-html
|
||||
%{python2_sitelib}/avocado_result_html/
|
||||
%{python2_sitelib}/avocado_result_html-%{version}-py%{python2_version}.egg-info
|
||||
%{python2_sitelib}/avocado_framework_plugin_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
|
||||
%{python2_sitelib}/avocado_framework_plugin_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
|
||||
%{python2_sitelib}/avocado_framework_plugin_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
|
||||
%{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info
|
||||
|
||||
|
||||
%files -n python-%{srcname}-examples
|
||||
|
|
@ -330,6 +332,10 @@ selftests/run
|
|||
%{_docdir}/avocado/wrappers
|
||||
|
||||
%changelog
|
||||
* 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.
|
||||
|
||||
* Mon Mar 27 2017 Merlin Mathesius <mmathesi@redhat.com> - 47.0-1
|
||||
- Sync with upstream release 47.0.
|
||||
- Enable self-tests during build.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue