From 9a5c1177a7d5f5b6793b8484fc0b8101d57d6481 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: May 25 2017 10:24:25 +0000 Subject: Fix building on Perl without '.' in @INC --- diff --git a/munin-2.0.33-Fix-building-on-Perl-without-dot-in-INC.patch b/munin-2.0.33-Fix-building-on-Perl-without-dot-in-INC.patch new file mode 100644 index 0000000..d170b42 --- /dev/null +++ b/munin-2.0.33-Fix-building-on-Perl-without-dot-in-INC.patch @@ -0,0 +1,24 @@ +diff -up munin-2.0.33/master/Build.PL.orig munin-2.0.33/master/Build.PL +--- munin-2.0.33/master/Build.PL.orig 2017-05-25 12:15:34.037053427 +0200 ++++ munin-2.0.33/master/Build.PL 2017-05-25 12:15:53.935936213 +0200 +@@ -1,3 +1,4 @@ ++BEGIN { push @INC, '.'; } + use MasterBuilder; + + use warnings; +diff -up munin-2.0.33/node/Build.PL.orig munin-2.0.33/node/Build.PL +--- munin-2.0.33/node/Build.PL.orig 2017-05-25 12:16:06.121864433 +0200 ++++ munin-2.0.33/node/Build.PL 2017-05-25 12:16:17.849795350 +0200 +@@ -1,3 +1,4 @@ ++BEGIN { push @INC, '.'; } + use NodeBuilder; + + use warnings; +diff -up munin-2.0.33/plugins/Build.PL.orig munin-2.0.33/plugins/Build.PL +--- munin-2.0.33/plugins/Build.PL.orig 2017-05-25 12:16:30.426721266 +0200 ++++ munin-2.0.33/plugins/Build.PL 2017-05-25 12:16:40.500661926 +0200 +@@ -1,3 +1,4 @@ ++BEGIN { push @INC, '.'; } + use PluginsBuilder; + + use warnings; diff --git a/munin.spec b/munin.spec index 2aa86ea..b177d9c 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-wide graphing framework (grapher/gatherer) Group: System Environment/Daemons @@ -52,6 +52,7 @@ Patch14: mariadb-innodb.patch #Patch15: https://patch-diff.githubusercontent.com/raw/munin-monitoring/munin/pull/737.patch #Patch16: https://patch-diff.githubusercontent.com/raw/munin-monitoring/munin/pull/759.patch #Patch17: https://patch-diff.githubusercontent.com/raw/munin-monitoring/munin/pull/797.patch +Patch18: munin-2.0.33-Fix-building-on-Perl-without-dot-in-INC.patch BuildArch: noarch @@ -356,6 +357,7 @@ rm -f plugins/node.d/memcached_.in %patch14 -p1 #% patch15 -p1 #% patch16 -p1 +%patch18 -p1 install -c %{SOURCE13} ./resources/ # Create Makefile.config-dist @@ -880,6 +882,9 @@ exit 0 %changelog +* Thu May 25 2017 Jitka Plesnikova - 2.0.33-2 +- Fix building on Perl without '.' in @INC + * Fri Mar 03 2017 "D. Johnson" - 2.0.33-1 - Upstream released 2.0.33