- updated to 2.0.75

diff --git a/munin.spec b/munin.spec
index bb29446abf9f85c37e3292a6b26dc9828a35151a..a307af970a3d4fb19b5ac6234179f0e13205fbfa 100644 (file)
--- a/munin.spec
+++ b/munin.spec
@@ -4,12 +4,12 @@
 Summary:       Munin - the Linpro RRD data agent
 Summary(pl.UTF-8):     Munin - agent danych RRD Linpro
 Name:          munin
-Version:       2.0.72
+Version:       2.0.75
 Release:       1
 License:       GPL
 Group:         Applications/WWW
 Source0:       https://github.com/munin-monitoring/munin/archive/%{version}.tar.gz
-# Source0-md5: c74a84cdeb0e0819b04018e5ca1739db
+# Source0-md5: e793d7d139df7cd7730089186a3afc28
 Source1:       %{name}-node.init
 Source2:       %{name}.cron
 Source3:       %{name}-apache.conf
@@ -25,15 +25,17 @@ Patch1:             %{name}-plugins.patch
 Patch2:                %{name}-templatedir.patch
 Patch3:                %{name}-separate-configs.patch
 Patch4:                %{name}-timeout.patch
+Patch5:                shebang.patch
 URL:           http://munin.sourceforge.net/
 BuildRequires: perl-Encode
+BuildRequires: perl-Module-Build
 BuildRequires: perl-Net-SNMP
 BuildRequires: perl-devel
 BuildRequires: rpm-perlprov
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.671
 BuildRequires: which
-Requires(triggerpostun):       sed >= 4.0
+Requires(postun):      sed >= 4.0
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      fonts-TTF-DejaVu
 Requires:      perl-Date-Manip
@@ -138,6 +140,7 @@ Munin.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__make} -j1 build \

diff --git a/shebang.patch b/shebang.patch
new file mode 100644 (file)
index 0000000..86707ab
--- /dev/null
+++ b/shebang.patch
@@ -0,0 +1,16 @@
+diff -u munin-2.0.75.orig/Makefile.config munin-2.0.75/Makefile.config
+--- munin-2.0.75.orig/Makefile.config  2023-10-25 10:03:45.000000000 +0200
++++ munin-2.0.75/Makefile.config       2024-01-11 01:01:31.148011121 +0100
+@@ -66,10 +66,10 @@
+ PERL       := $(shell which perl)
+ 
+ # The python interpreter to use (used by some plugins)
+-PYTHON     := /usr/bin/env python3
++PYTHON     := /usr/bin/python3
+ 
+ # The ruby interpreter to use (used by some plugins)
+-RUBY       := /usr/bin/env ruby
++RUBY       := /usr/bin/ruby
+ 
+ # The java runtime to use (used by some plugins)
+ JAVARUN    := /usr/bin/java