diff --git a/.gitignore b/.gitignore index fa10900..6e78c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rhc-worker-playbook-0.1.2.tar.gz +SOURCES/rhc-worker-playbook-0.1.4.tar.gz diff --git a/.rhc-worker-playbook.metadata b/.rhc-worker-playbook.metadata index 52a2463..8612ce0 100644 --- a/.rhc-worker-playbook.metadata +++ b/.rhc-worker-playbook.metadata @@ -1 +1 @@ -094e4227799162fd39487d4e4550cb358f5b6053 SOURCES/rhc-worker-playbook-0.1.2.tar.gz +1c0a8f1d27de89bd2e0503faf4c0ec3dc88f4ef8 SOURCES/rhc-worker-playbook-0.1.4.tar.gz diff --git a/SPECS/rhc-worker-playbook.spec b/SPECS/rhc-worker-playbook.spec index 5aeb414..1b1c61d 100644 --- a/SPECS/rhc-worker-playbook.spec +++ b/SPECS/rhc-worker-playbook.spec @@ -1,13 +1,22 @@ +%define debug_package %{nil} + Name: rhc-worker-playbook Summary: Red Hat connect worker for launching Ansible Runner -Version: 0.1.2 -Release: 4%{?dist} +Version: 0.1.4 +Release: 1%{?dist} License: GPLv2+ -Source: rhc-worker-playbook-0.1.2.tar.gz +Source: rhc-worker-playbook-0.1.4.tar.gz + +ExclusiveArch: %{go_arches} %{?__python3:Requires: %{__python3}} +Requires: insights-client +Requires: python3dist(requests) +BuildRequires: rhc +BuildRequires: pkgconfig BuildRequires: python3-devel -BuildRequires: platform-python-pip +BuildRequires: python3dist(pip) +BuildRequires: python3dist(wheel) BuildRequires: openssl-devel BuildRequires: c-ares-devel BuildRequires: zlib-devel @@ -19,30 +28,31 @@ Python-based worker for Red Hat connect, used to launch Ansible playbooks via An %prep %setup -q -%install +%build export GRPC_PYTHON_BUILD_WITH_CYTHON=True export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=True export GRPC_PYTHON_BUILD_SYSTEM_CARES=True export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=True -%{make_install} BUILDROOT=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} LIBEXECDIR=%{_libexecdir} PYTHON=%{__python3} - -%post +%define rhc_config_dir $(pkg-config rhc --variable workerconfdir) -%preun +%{__make} PREFIX=%{_prefix} LIBDIR=%{_libdir} installed-lib-dir CONFIG_DIR=%{rhc_config_dir} +%{make_build} build -%postun - -%clean -rm -rf %{buildroot} +%install +%{make_install} PREFIX=%{_prefix} LIBDIR=%{_libdir} CONFIG_DIR=%{rhc_config_dir} %files %{_libexecdir}/rhc/rhc-worker-playbook.worker %{python3_sitelib}/rhc_worker_playbook/ %{python3_sitelib}/rhc_worker_playbook*.egg-info/ %{_libdir}/rhc-worker-playbook/ +%config %{_sysconfdir}/rhc/workers/rhc-worker-playbook.toml %doc %changelog - +* Thu Mar 25 2021 Jeremy Crafts - 0.1.4-1 +- Enhancements to playbook validation +- Fixes for regular execution status updates +- Configuration fixes