diff --git a/etc/avocado/conf.d/.gitignore b/etc/avocado/conf.d/.gitignore deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/python-avocado.spec b/python-avocado.spec index 2b3b7fdb50388b57abea732eb43403e1e7bd13f2..0a9dbf158b10ca9b80bb2950d7b69bcff22b7b12 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -29,7 +29,7 @@ Summary: Framework with tools and libraries for Automated Testing Name: python-%{srcname} Version: 53.0 -Release: 0%{?gitrel}%{?dist} +Release: 1%{?gitrel}%{?dist} License: GPLv2 Group: Development/Tools URL: http://avocado-framework.github.io/ @@ -201,20 +201,20 @@ AVOCADO_CHECK_LEVEL=0 selftests/run %files %defattr(-,root,root,-) %doc README.rst LICENSE -%dir /etc/avocado -%dir /etc/avocado/conf.d -%dir /etc/avocado/sysinfo -%dir /etc/avocado/scripts/job/pre.d -%dir /etc/avocado/scripts/job/post.d +%dir %{_sysconfdir}/avocado +%dir %{_sysconfdir}/avocado/conf.d +%dir %{_sysconfdir}/avocado/sysinfo +%dir %{_sysconfdir}/avocado/scripts/job/pre.d +%dir %{_sysconfdir}/avocado/scripts/job/post.d %dir %{_sharedstatedir}/avocado -%config(noreplace)/etc/avocado/avocado.conf -%config(noreplace)/etc/avocado/conf.d/README -%config(noreplace)/etc/avocado/conf.d/gdb.conf -%config(noreplace)/etc/avocado/sysinfo/commands -%config(noreplace)/etc/avocado/sysinfo/files -%config(noreplace)/etc/avocado/sysinfo/profilers -%config(noreplace)/etc/avocado/scripts/job/pre.d/README -%config(noreplace)/etc/avocado/scripts/job/post.d/README +%config(noreplace)%{_sysconfdir}/avocado/avocado.conf +%config(noreplace)%{_sysconfdir}/avocado/conf.d/README +%config(noreplace)%{_sysconfdir}/avocado/conf.d/gdb.conf +%config(noreplace)%{_sysconfdir}/avocado/sysinfo/commands +%config(noreplace)%{_sysconfdir}/avocado/sysinfo/files +%config(noreplace)%{_sysconfdir}/avocado/sysinfo/profilers +%config(noreplace)%{_sysconfdir}/avocado/scripts/job/pre.d/README +%config(noreplace)%{_sysconfdir}/avocado/scripts/job/post.d/README %{python_sitelib}/avocado* %{_bindir}/avocado %{_bindir}/avocado-rest-client @@ -361,10 +361,19 @@ Some of them are used as functional tests of the framework, others serve as examples of how to write tests on your own. %files examples +%{_datadir}/avocado/gdb-prerun-scripts +%{_datadir}/avocado/plugins %{_datadir}/avocado/tests %{_datadir}/avocado/wrappers +%{_datadir}/avocado/yaml_to_mux +%{_datadir}/avocado/yaml_to_mux_loader %changelog +* Tue Aug 22 2017 Cleber Rosa - 53.0-1 +- Use variable name for configuration dir +- Clean up old changelog entries +- Include other example files + * Tue Aug 15 2017 Cleber Rosa - 53.0-0 - New upstream release @@ -376,265 +385,3 @@ examples of how to write tests on your own. * Mon Jun 26 2017 Cleber Rosa - 52.0-0 - New upstream release - -* Mon Jun 12 2017 Cleber Rosa - 51.0-0 -- New upstream release - -* Fri May 19 2017 Lukas Doktor - 50.0-1 -- Separate the varianter_yaml_to_mux plugin to a separate RPM - -* Tue May 16 2017 Cleber Rosa - 50.0-0 -- New upstream release - -* Thu Apr 27 2017 Cleber Rosa - 49.0-2 -- Also setup resultsdb plugin on check -- Be explicit about selftest level run on check -- Take ownership of base avocado data dir (/var/lib/avocado) - -* Tue Apr 25 2017 Cleber Rosa - 49.0-1 -- Added missing runner-docker directory - -* Tue Apr 25 2017 Cleber Rosa - 49.0-0 -- New upstream release - -* Mon Apr 24 2017 Cleber Rosa - 48.0-5 -- Add subpackage for resultsdb plugin - -* Wed Apr 19 2017 Cleber Rosa - 48.0-4 -- Added "/var/lib/avocado" directory for writable content - -* Wed Apr 19 2017 Cleber Rosa - 48.0-3 -- Fix exclusion of optional plugins files done on 48.0-1 - -* Mon Apr 10 2017 Cleber Rosa - 48.0-2 -- Update how release and snapshot packages are built - -* Mon Apr 3 2017 Cleber Rosa - 48.0-1 -- Updated exclude directives and files for optional plugins - -* Mon Apr 3 2017 Cleber Rosa - 48.0-0 -- New upstream release - -* Fri Mar 31 2017 Cleber Rosa - 47.0-2 -- Switch directory change statements to match downstream -- Change requirements style to one per line -- Add conditional execution of selftests - -* Wed Mar 8 2017 Cleber Rosa - 47.0-1 -- Rename package to python-avocado and subpackges accordingly - -* Mon Mar 6 2017 Cleber Rosa - 47.0-0 -- New upstream release - -* Wed Feb 15 2017 Cleber Rosa - 46.0-2 -- Removed python-crypto dependency from base avocado package - -* Wed Feb 15 2017 Cleber Rosa - 46.0-1 -- Fixed packager email -- Added explicit requirement - -* Tue Feb 14 2017 Cleber Rosa - 46.0-0 -- New upstream release - -* Sun Feb 5 2017 Cleber Rosa - 45.0-2 -- Split package into plugins-runner-{remote,vm,docker} packages - -* 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 - -* Wed Dec 7 2016 Cleber Rosa - 44.0-0 -- New upstream release - -* Tue Nov 8 2016 Cleber Rosa - 43.0-0 -- New upstream release - -* Mon Oct 10 2016 Cleber Rosa - 42.0-0 -- New upstream release - -* Fri Sep 16 2016 Cleber Rosa - 41.0-1 -- Consolidated build requires common to all targets -- Enabled check on EL6 - -* Mon Sep 12 2016 Cleber Rosa - 41.0-0 -- New upstream release - -* Tue Sep 6 2016 Cleber Rosa - 40.0-1 -- Adapt build of now separate html plugin - -* Tue Aug 16 2016 Cleber Rosa - 40.0-0 -- New upstream release - -* Tue Aug 2 2016 Cleber Rosa - 39.0-1 -- Added expect requirement (for Docker plugin) - -* Tue Jul 26 2016 Cleber Rosa - 39.0-0 -- New upstream release - -* Mon Jul 4 2016 Cleber Rosa - 38.0-0 -- New upstream release - -* Tue Jun 14 2016 Cleber Rosa - 37.0-0 -- New upstream release - -* Thu May 05 2016 Amador Pahim - 35.0-1 -- Removed simpletests directory - -* Wed Apr 27 2016 Cleber Rosa - 35.0-0 -- New upstream release 35.0 (new versioning scheme) - -* Thu Apr 14 2016 Cleber Rosa - 0.34.0-1 -- Added job pre/post scripts directories - -* Mon Mar 21 2016 Cleber Rosa - 0.34.0-0 -- New upstream release 0.34.0 - -* Wed Feb 17 2016 Cleber Rosa - 0.33.0-1 -- Updated requirement: procps for EL6, procps-ng for other distros - -* Tue Feb 16 2016 Cleber Rosa - 0.33.0-0 -- New upstream release 0.33.0 - -* Wed Jan 20 2016 Cleber Rosa - 0.32.0-0 -- New upstream release 0.32.0 - -* Wed Dec 23 2015 Cleber Rosa - 0.31.0-0 -- New upstream release 0.31.0 - -* Tue Nov 17 2015 Cleber Rosa - 0.30.0-1 -- Add python-stevedore to Requires - -* Thu Nov 5 2015 Cleber Rosa - 0.30.0-0 -- New upstream release 0.30.0 - -* Wed Oct 7 2015 Lucas Meneghel Rodrigues - 0.29.0-2 -- Add python-setuptools to BuildRequires - -* Wed Oct 7 2015 Lucas Meneghel Rodrigues - 0.29.0-1 -- New upstream release 0.29.0 - -* Wed Sep 16 2015 Lucas Meneghel Rodrigues - 0.28.0-2 -- Add pystache, aexpect, psutil, sphinx and yum/dnf dependencies for functional/unittests - -* Wed Sep 16 2015 Lucas Meneghel Rodrigues - 0.28.0-1 -- New upstream release 0.28.0 - -* Tue Aug 4 2015 Lucas Meneghel Rodrigues - 0.27.0-3 -- Added 'gdb' and 'gdb-gdbserver' as requirements - -* Mon Aug 3 2015 Lucas Meneghel Rodrigues - 0.27.0-2 -- Added 'python-mock' as a build requirement - -* Mon Aug 3 2015 Lucas Meneghel Rodrigues - 0.27.0-1 -- New upstream release 0.27.0 - -* Mon Jul 6 2015 Lucas Meneghel Rodrigues - 0.26.0-1 -- New upstream release 0.26.0 - -* Tue Jun 16 2015 Lucas Meneghel Rodrigues - 0.25.0-2 -- Fix spec bug with BuildRequires on EPEL6 - -* Tue Jun 16 2015 Lucas Meneghel Rodrigues - 0.25.0-1 -- New upstream release 0.25.0 - -* Fri Jun 5 2015 Cleber Rosa - 0.24.0-3 -- Removed rest client API examples - -* Mon May 25 2015 Cleber Rosa - 0.24.0-2 -- Added previously missing gdb.conf - -* Mon May 18 2015 Ruda Moura - 0.24.0-1 -- Update to upstream version 0.24.0 - -* Tue Apr 21 2015 Lucas Meneghel Rodrigues - 0.23.0-1 -- New upstream release - -* Mon Apr 13 2015 Cleber Rosa - 0.21.0-6 -- Added sysinfo configuration files - -* Sat Mar 28 2015 Cleber Rosa - 0.21.0-5 -- Change the way man pages are built, now using Makefile targets -- Reorganized runtime and build requirements -- Add a check section that runs unittests on Fedora - -* Thu Mar 19 2015 Lucas Meneghel Rodrigues - 0.21.0-4 -- COPR build fixes - -* Mon Mar 16 2015 Lucas Meneghel Rodrigues - 0.21.0-3 -- COPR build fixes - -* Mon Mar 16 2015 Lucas Meneghel Rodrigues - 0.21.0-2 -- COPR build fixes - -* Mon Mar 16 2015 Lucas Meneghel Rodrigues - 0.21.0-1 -- COPR build fixes - -* Mon Mar 16 2015 Lucas Meneghel Rodrigues - 0.21.0-0 -- Update to upstream version 0.21.0 - -* Mon Feb 23 2015 Cleber Rosa - 0.20.1-2 -- Added avocado-rest-client modules, script, man page and API examples - -* Fri Feb 6 2015 Lucas Meneghel Rodrigues - 0.20.1-1 -- Update to upstream version 0.20.1 - -* Tue Feb 3 2015 Lucas Meneghel Rodrigues - 0.20.0-1 -- Update to upstream version 0.20.0 - -* Mon Dec 15 2014 Lucas Meneghel Rodrigues - 0.17.0-1 -- Update to upstream version 0.17.0 - -* Wed Dec 3 2014 Lucas Meneghel Rodrigues - 0.14.0-3 -- Change config file name from settings.ini to avocado.conf - -* Wed Dec 3 2014 Ruda Moura - 0.14.0-2 -- Include all wrappers scripts to examples subpackage. - -* Mon Oct 13 2014 Lucas Meneghel Rodrigues - 0.14.0-1 -- New upstream release - -* Thu Sep 11 2014 Lucas Meneghel Rodrigues - 0.12.0-2 -- Rename -tests package to -examples - -* Tue Sep 9 2014 Lucas Meneghel Rodrigues - 0.12.0-1 -- New upstream release - -* Tue Sep 2 2014 Lucas Meneghel Rodrigues - 0.11.1-2 -- Added fabric dependency - -* Wed Aug 20 2014 Lucas Meneghel Rodrigues - 0.11.1-1 -- Bumped version to avocado 0.11.1 -- Added python-yaml build dependency - -* Wed Aug 20 2014 Lucas Meneghel Rodrigues - 0.11.0-1 -- Bumped version to avocado 0.11.0 -- Added python-yaml new dependency - -* Wed Aug 20 2014 Cleber Rosa - 0.10.1-2 -- Added initial avocado man page - -* Tue Aug 12 2014 Lucas Meneghel Rodrigues - 0.10.1-1 -- Bugfix release 0.10.1 - -* Thu Aug 7 2014 Lucas Meneghel Rodrigues - 0.10.0-1 -- Bumped version to Avocado 0.10.0 - -* Wed Jul 30 2014 Cleber Rosa - 0.8.0-2 -- Split tests into avocado-tests package - -* Fri Jul 18 2014 Lucas Meneghel Rodrigues - 0.8.0-1 -- Bumped version to Avocado 0.8.0 - -* Fri Jun 13 2014 Ruda Moura - 0.6.0-1 -- Bumped version to Avocado 0.6.0 - -* Thu May 8 2014 Ruda Moura - 0.4.0-1 -- Bumped version to Avocado 0.4.0 - -* Wed Apr 30 2014 Cleber Rosa - 0.0.1-2 -- Added new requirements reflecting new upstream deps - -* Wed Apr 2 2014 Ruda Moura - 0.0.1-1 -- Created initial spec file diff --git a/setup.py b/setup.py index a6c84303ffd05817d38dfcd84cc160a2df62fce6..875000c34bfc69fcaf6e5fd3ac62d4c7260528df 100755 --- a/setup.py +++ b/setup.py @@ -82,6 +82,33 @@ def get_data_files(): glob.glob('examples/wrappers/*.sh'))] data_files.append((get_avocado_libexec_dir(), glob.glob('libexec/*'))) + data_files += [(get_dir(['usr', 'share', 'avocado', 'gdb-prerun-scripts'], + ['gdb-prerun-scripts']), + glob.glob('examples/gdb-prerun-scripts/*'))] + data_files += [(get_dir(['usr', 'share', 'avocado', 'plugins', + 'job-pre-post'], + ['plugins/job-pre-post']), + glob.glob('examples/plugins/job-pre-post/README.rst'))] + data_files += [(get_dir(['usr', 'share', 'avocado', 'plugins', + 'job-pre-post', 'mail'], + ['plugins/job-pre-post/mail']), + glob.glob('examples/plugins/job-pre-post/mail/*'))] + data_files += [(get_dir(['usr', 'share', 'avocado', 'plugins', + 'job-pre-post', 'sleep'], + ['plugins/job-pre-post/sleep']), + glob.glob('examples/plugins/job-pre-post/sleep/*'))] + data_files += [(get_dir(['usr', 'share', 'avocado', 'yaml_to_mux'], + ['yaml_to_mux']), + glob.glob('examples/yaml_to_mux/*.yaml'))] + data_files += [(get_dir(['usr', 'share', 'avocado', 'yaml_to_mux', 'hw'], + ['yaml_to_mux/hw']), + glob.glob('examples/yaml_to_mux/hw/*.yaml'))] + data_files += [(get_dir(['usr', 'share', 'avocado', 'yaml_to_mux', 'os'], + ['yaml_to_mux/os']), + glob.glob('examples/yaml_to_mux/os/*.yaml'))] + data_files += [(get_dir(['usr', 'share', 'avocado', 'yaml_to_mux_loader'], + ['yaml_to_mux_loader']), + glob.glob('examples/yaml_to_mux_loader/*.yaml'))] return data_files