From 8899f2333ff01306910617924db1dfd7c5f72655 Mon Sep 17 00:00:00 2001 From: Eric Schoeller Date: Mon, 23 Dec 2024 10:57:28 -0700 Subject: [PATCH 1/3] upgrade thruk and thruk libs to 3.20 release --- libthruk.spec | 2 +- thruk.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libthruk.spec b/libthruk.spec index 31b2096..29d18ea 100644 --- a/libthruk.spec +++ b/libthruk.spec @@ -2,7 +2,7 @@ Summary: Thruk perl libraries Name: libthruk -Version: 3.00 +Version: 3.20 Release: 0 License: GPL-2.0-or-later Group: Applications/System diff --git a/thruk.spec b/thruk.spec index b12aa2d..8cb1f59 100644 --- a/thruk.spec +++ b/thruk.spec @@ -11,7 +11,7 @@ %undefine _disable_source_fetch Name: thruk -Version: 3.12 +Version: 3.20.2 Release: 12878.1 License: GPL-2.0-or-later Packager: Sven Nierlein From 3fa45b8e398996064b2251c206c29800644224b7 Mon Sep 17 00:00:00 2001 From: Eric Schoeller Date: Mon, 23 Dec 2024 11:11:32 -0700 Subject: [PATCH 2/3] updated build procedure to reflect new libthruk version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 892ef81..3c28a44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,7 +140,7 @@ jobs: uses: UCBoulder/oit-sepe-rpmbuild@master with: spec_file: "thruk.spec" - additional_repos: '["epel-release", "/github/workspace/x86_64/libthruk-3.00-0.x86_64.rpm"]' + additional_repos: '["epel-release", "/github/workspace/x86_64/libthruk-3.20-0.x86_64.rpm"]' - name: Upload artifact uses: actions/upload-artifact@v4 From 38452952554fbdbbbc2caed7991635eb504364c3 Mon Sep 17 00:00:00 2001 From: Eric Schoeller Date: Mon, 23 Dec 2024 12:45:00 -0700 Subject: [PATCH 3/3] merged upstream changes into spec file --- thruk.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/thruk.spec b/thruk.spec index 8cb1f59..3f5c321 100644 --- a/thruk.spec +++ b/thruk.spec @@ -12,7 +12,7 @@ Name: thruk Version: 3.20.2 -Release: 12878.1 +Release: 13569.1 License: GPL-2.0-or-later Packager: Sven Nierlein Vendor: Labs Consol @@ -147,6 +147,9 @@ cp support/thruk_cookie_auth.include.apache22 support/thruk_cookie_auth.inclu cp support/thruk_cookie_auth_vhost.conf.apache22 support/thruk_cookie_auth_vhost.conf %endif +%if 0%{?rhel} >= 8 +%endif + # remove version control files find . -name .gitignore -delete @@ -450,6 +453,10 @@ exit 0 %config %{_sysconfdir}/%{name}/plugins/plugins-available/core_scheduling %{_datadir}/%{name}/plugins/plugins-available/agents %config %{_sysconfdir}/%{name}/plugins/plugins-available/agents +%{_datadir}/%{name}/plugins/plugins-available/editor +%config %{_sysconfdir}/%{name}/plugins/plugins-available/editor +%{_datadir}/%{name}/plugins/plugins-available/node-control +%config %{_sysconfdir}/%{name}/plugins/plugins-available/node-control %config(noreplace) %{_sysconfdir}/thruk/themes %config(noreplace) %{_sysconfdir}/thruk/menu_local.conf %config(noreplace) %{_sysconfdir}/thruk/usercontent/