Skip to content

Commit

Permalink
Merge pull request #6 from UCBoulder/thruk_upgrade_3.20.2
Browse files Browse the repository at this point in the history
Thruk upgrade 3.20.2
  • Loading branch information
eschoeller authored Dec 23, 2024
2 parents aba47f8 + 3845295 commit eadb4de
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libthruk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions thruk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
%undefine _disable_source_fetch

Name: thruk
Version: 3.12
Release: 12878.1
Version: 3.20.2
Release: 13569.1
License: GPL-2.0-or-later
Packager: Sven Nierlein <[email protected]>
Vendor: Labs Consol
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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/
Expand Down

0 comments on commit eadb4de

Please sign in to comment.