Changes - j0ke.net Open Build Service

[-] [+]	Changed	munin.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 19 21:29:45 UTC 2014 - cs@linux-administrator.com + +- adapt build for EL7 + +------------------------------------------------------------------- Mon Oct 27 16:07:53 UTC 2014 - cs@linux-administrator.com - Update to release 2.0.24
[-] [+]	Changed	munin.spec ^
@@ -41,7 +41,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root +%if 0%{?suse_version} BuildRequires: html2text htmldoc +%endif BuildRequires: perl-Module-Build perl-HTML-Template perl-Log-Log4perl perl(Getopt::Long) >= 2.37 BuildRequires: perl(Net::SSLeay) BuildRequires: perl(Net::Server) @@ -123,6 +125,12 @@ %setup -q -n %{name}-%{pversion} %build +%if 1%{?suse_version} +# htmldoc and html2text are not available for Red Hat. Quick hack with perl: +# Skip the PDFs. +perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text\|doc),# $&,' Makefile +perl -pi -e 's,\$\(INSTALL.+\.(pdf\|txt) \$\(DOCDIR,# $&,' Makefile +%endif make CONFIG=%{SOURCE1} \ DOCDIR=%{_docdir}/munin \