diff --git a/.gitignore b/.gitignore index 30aea73..c81d837 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /avocado-43.0.tar.gz /avocado-46.0.tar.gz /avocado-47.0.tar.gz +/avocado-48.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 0068081..0f26026 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -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 - 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 - 47.0-1 - Sync with upstream release 47.0. - Enable self-tests during build. diff --git a/sources b/sources index f31551d..bbd8d23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-47.0.tar.gz) = 196bcd2d79835d6426428098f4c713507907feb28629eb7cf261c00f010bdf169f19420d627e2895183d00860b01d31b25a59e88e0de6115bcaa876e8ccc951c +SHA512 (avocado-48.0.tar.gz) = 6838b515824d9219e76ba7084a6706ed17ed5ae83e8d705b83cdfe725926b97b204263b4f79afad49fe958304ed0e6ab39dba8bb77d0fce9793065d4783fcb51