diff options
| author | Alan Pevec <apevec@redhat.com> | 2012-11-19 12:05:48 +0100 |
|---|---|---|
| committer | Alan Pevec <apevec@redhat.com> | 2012-11-19 12:06:20 +0100 |
| commit | ea6362576026713a2c44de390953a21342074757 (patch) | |
| tree | c557cff67400ddf6ec8b55094b03ccf05ede6dad | |
| parent | d3ceb08841da17cefe2aafcadb5470014d6d1bd3 (diff) | |
| download | collectd-ea6362576026713a2c44de390953a21342074757.tar.gz collectd-ea6362576026713a2c44de390953a21342074757.tar.xz collectd-ea6362576026713a2c44de390953a21342074757.zip | |
fixperlinstall from 4.10.8 by Kevin
| -rw-r--r-- | collectd.spec | 3 | ||||
| -rw-r--r-- | fixperlinstall.patch | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/collectd.spec b/collectd.spec index 503568d..6da195b 100644 --- a/collectd.spec +++ b/collectd.spec @@ -11,6 +11,7 @@ Source1: collectd-httpd.conf Source2: collection.conf Source3: collectd.service Patch1: %{name}-include-collectd.d.patch +Patch2: fixperlinstall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -188,6 +189,7 @@ This plugin collects information from virtualized guests. %prep %setup -q %patch1 +%patch2 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in @@ -651,6 +653,7 @@ fi %changelog * Mon Nov 19 2012 Alan Pevec <apevec@redhat.com> 5.0.5-1 - new upstream version 5.0.5 + http://mailman.verplant.org/pipermail/collectd/2012-November/005465.html * Mon Sep 17 2012 Alan Pevec <apevec@redhat.com> 5.0.4-1 - New upstream release, version bump to 5 (#743894) from Andrew Elwell diff --git a/fixperlinstall.patch b/fixperlinstall.patch new file mode 100644 index 0000000..1b8a2f2 --- /dev/null +++ b/fixperlinstall.patch @@ -0,0 +1,24 @@ +diff -Nur bindings/Makefile.am bindings/Makefile.am +--- bindings/Makefile.am 2012-11-11 03:43:05.000000000 -0700 ++++ bindings/Makefile.am 2012-11-18 10:34:15.937674174 -0700 +@@ -48,7 +48,7 @@ + + buildperl/Makefile: .perl-directory-stamp buildperl/Makefile.PL \ + $(top_builddir)/config.status +- cd buildperl && @PERL@ Makefile.PL INSTALL_BASE=$(prefix) @PERL_BINDINGS_OPTIONS@ ++ cd buildperl && @PERL@ Makefile.PL @PERL_BINDINGS_OPTIONS@ + + buildperl/Makefile.PL: .perl-directory-stamp $(top_builddir)/config.status + +diff -Nur bindings/Makefile.in bindings/Makefile.in +--- bindings/Makefile.in 2012-11-18 10:33:13.530044620 -0700 ++++ bindings/Makefile.in 2012-11-18 10:34:21.340724920 -0700 +@@ -710,7 +710,7 @@ + + buildperl/Makefile: .perl-directory-stamp buildperl/Makefile.PL \ + $(top_builddir)/config.status +- cd buildperl && @PERL@ Makefile.PL INSTALL_BASE=$(prefix) @PERL_BINDINGS_OPTIONS@ ++ cd buildperl && @PERL@ Makefile.PL @PERL_BINDINGS_OPTIONS@ + + buildperl/Makefile.PL: .perl-directory-stamp $(top_builddir)/config.status + |