diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e12cd7..892ef81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: uses: UCBoulder/oit-sepe-rpmbuild@master with: spec_file: "naemon-livestatus.spec" - additional_repos: '["epel-release", "/github/workspace/x86_64/libnaemon-1.4.1-0.x86_64.rpm", "/github/workspace/x86_64/naemon-devel-1.4.1-0.x86_64.rpm"]' + additional_repos: '["epel-release", "/github/workspace/x86_64/libnaemon-1.4.2-0.x86_64.rpm", "/github/workspace/x86_64/naemon-devel-1.4.2-0.x86_64.rpm"]' - name: Upload artifact uses: actions/upload-artifact@v4 @@ -76,7 +76,7 @@ jobs: uses: UCBoulder/oit-sepe-rpmbuild@master with: spec_file: "naemon-vimvault.spec" - additional_repos: '["epel-release", "/github/workspace/x86_64/libnaemon-1.4.1-0.x86_64.rpm", "/github/workspace/x86_64/naemon-devel-1.4.1-0.x86_64.rpm"]' + additional_repos: '["epel-release", "/github/workspace/x86_64/libnaemon-1.4.2-0.x86_64.rpm", "/github/workspace/x86_64/naemon-devel-1.4.2-0.x86_64.rpm"]' - name: Upload artifact uses: actions/upload-artifact@v4 @@ -99,7 +99,7 @@ jobs: uses: UCBoulder/oit-sepe-rpmbuild@master with: spec_file: "merlin.spec" - additional_repos: '["epel-release", "/github/workspace/x86_64/libnaemon-1.4.1-0.x86_64.rpm", "/github/workspace/x86_64/naemon-devel-1.4.1-0.x86_64.rpm"]' + additional_repos: '["epel-release", "/github/workspace/x86_64/libnaemon-1.4.2-0.x86_64.rpm", "/github/workspace/x86_64/naemon-devel-1.4.2-0.x86_64.rpm"]' - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/merlin.spec b/merlin.spec index 5641ef7..b146d46 100644 --- a/merlin.spec +++ b/merlin.spec @@ -19,7 +19,7 @@ Summary: The merlin daemon is a multiplexing event-transport program Name: merlin -Version: 2022.06.02 +Version: 2024.09.10 Release: 0 License: GPLv2 URL: https://github.com/ITRS-Group/monitor-merlin/ @@ -38,7 +38,7 @@ Requires: libsodium Requires: systemd BuildRequires: libsodium-devel BuildRequires: mariadb-devel -BuildRequires: naemon-devel < 1.4.2 +BuildRequires: naemon-devel BuildRequires: python2 BuildRequires: gperf BuildRequires: check-devel @@ -58,7 +58,7 @@ Summary: Slim version of the merlin daemon Requires: libaio Requires: merlin-apps-slim >= %version Requires: glib2 -BuildRequires: naemon-devel < 1.4.2 +BuildRequires: naemon-devel BuildRequires: python2 BuildRequires: gperf BuildRequires: check-devel diff --git a/naemon-core.spec b/naemon-core.spec index 0f1e7e8..080a16a 100644 --- a/naemon-core.spec +++ b/naemon-core.spec @@ -4,7 +4,7 @@ Summary: Open Source Host, Service And Network Monitoring Program Name: naemon-core -Version: 1.4.1 +Version: 1.4.2 Release: 0 License: GPL-2.0-only Group: Applications/System diff --git a/naemon-livestatus.spec b/naemon-livestatus.spec index f772b6f..f0e2bdd 100644 --- a/naemon-livestatus.spec +++ b/naemon-livestatus.spec @@ -2,7 +2,7 @@ Summary: Naemon Livestatus Eventbroker Module Name: naemon-livestatus -Version: 1.4.1 +Version: 1.4.2 Release: 0 License: GPL-2.0-only Group: Applications/System diff --git a/naemon-vimvault.spec b/naemon-vimvault.spec index 005daff..7671145 100644 --- a/naemon-vimvault.spec +++ b/naemon-vimvault.spec @@ -2,7 +2,7 @@ Summary: Naemon VimVault Eventbroker Module Name: naemon-vimvault -Version: 1.4.0 +Version: 1.4.2 Release: 0 License: GPL-3.0-or-later Group: Applications/System diff --git a/naemon.spec b/naemon.spec index a0e3f59..7d6f302 100644 --- a/naemon.spec +++ b/naemon.spec @@ -12,7 +12,7 @@ Summary: Open Source Host, Service And Network Monitoring Program Name: naemon -Version: 1.4.1 +Version: 1.4.2 Release: 0 License: GPL-2.0-only BuildArch: noarch