From 1255a8653048885b4397e35e74f5afa7c4b8e1ab0787884ea62fa1175f93f76c Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 20 Aug 2013 07:02:17 +0000 Subject: [PATCH] Accepting request 195649 from home:dstoecker Add requires to common for main munin. Format specfile with osc. OBS-URL: https://build.opensuse.org/request/show/195649 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/munin?expand=0&rev=9 --- munin.changes | 5 ++ munin.spec | 191 ++++++++++++++++++++------------------------------ 2 files changed, 80 insertions(+), 116 deletions(-) diff --git a/munin.changes b/munin.changes index 38c3be1..6aff342 100644 --- a/munin.changes +++ b/munin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 20 05:20:31 UTC 2013 - opensuse@dstoecker.de + +- fix requires for main munin package + ------------------------------------------------------------------- Mon May 27 02:00:38 CEST 2013 - draht@suse.de diff --git a/munin.spec b/munin.spec index 7fd0972..4110541 100644 --- a/munin.spec +++ b/munin.spec @@ -1,4 +1,20 @@ -# norootforbuild +# +# spec file for package munin +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + %define htmldir /srv/www/htdocs/munin %define cgidir /srv/www/cgi-bin @@ -7,27 +23,27 @@ %define plugindir /usr/lib/munin/plugins %define active_by_default 0 -Name: munin -Version: 2.0.14 -Release: 1 -License: GPL-2.0 -Summary: Network-wide graphing framework (grapher/gatherer) -Url: http://munin-monitoring.org/ -Group: System/Monitoring -Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Source1: Makefile.config +Name: munin +Version: 2.0.14 +Release: 0 +Summary: Network-wide graphing framework (grapher/gatherer) +License: GPL-2.0 +Group: System/Monitoring +Url: http://munin-monitoring.org/ +Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Source1: Makefile.config %if 0%{?suse_version} < 1220 -Source2: munin-node.rc +Source2: munin-node.rc %endif -Source3: munin.cron.d -Source4: munin.logrotate -Source5: munin-node.logrotate -Source7: plugins.conf +Source3: munin.cron.d +Source4: munin.logrotate +Source5: munin-node.logrotate +Source7: plugins.conf %if 0%{?suse_version} >= 1220 -Source8: munin-node.tmpfiles -Source9: munin-node.service -Source10: munin-cgi-graph.service -Source11: munin-cgi-html.service +Source8: munin-node.tmpfiles +Source9: munin-node.service +Source10: munin-cgi-graph.service +Source11: munin-cgi-html.service %endif # https://github.com/ifad/nginx-munin/archive/master.zip Source12: nginx-munin.zip @@ -35,26 +51,39 @@ Source12: nginx-munin.zip Source13: gsa-munin.zip # https://svn.koumbit.net/koumbit/trunk/munin-plugins/quota-usage Patch: munin-plugin-quota_usage_warnings.patch -BuildRequires: perl-HTML-Template perl-Log-Log4perl perl-Net-Server perl-Net-SNMP -BuildRequires: perl-Net-SSLeay -BuildRequires: html2text +BuildRequires: html2text +BuildRequires: perl-HTML-Template +BuildRequires: perl-Log-Log4perl +BuildRequires: perl-Net-SNMP +BuildRequires: perl-Net-SSLeay +BuildRequires: perl-Net-Server BuildRequires: pwdutils BuildRequires: unzip %if 0%{?suse_version} >= 1220 %{?systemd_requires} -BuildRequires: systemd -BuildRequires: htmldoc +BuildRequires: htmldoc +BuildRequires: systemd %else BuildRequires: sysvinit %endif -Requires: perl-base = %{perl_version} -Requires: perl-HTML-Template perl-Log-Log4perl perl-Net-Server perl-Net-SNMP -Requires: perl-Net-SSLeay perl-File-Copy-Recursive perl-Date-Manip -Requires: perl-IO-Socket-INET6 perl-URI perl-FastCGI spawn-fcgi pwdutils rrdtool -Recommends: logrotate cron -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - +Requires: perl-Date-Manip +Requires: perl-FastCGI +Requires: perl-File-Copy-Recursive +Requires: perl-HTML-Template +Requires: perl-IO-Socket-INET6 +Requires: perl-Log-Log4perl +Requires: perl-Net-SNMP +Requires: perl-Net-SSLeay +Requires: perl-Net-Server +Requires: perl-URI +Requires: perl-base = %{perl_version} +Requires: pwdutils +Requires: rrdtool +Requires: spawn-fcgi +Requires: perl(Munin::Common::Defaults) +Recommends: logrotate cron +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Munin is a highly flexible and powerful solution used to create graphs of @@ -71,14 +100,20 @@ RRDtool. %package node -Summary: Network-wide graphing framework (node) -Group: System/Monitoring -Requires: perl-base = %{perl_version} -Requires: perl-HTML-Template perl-Log-Log4perl perl-Net-Server perl-Net-SNMP -Requires: perl-Net-SSLeay -Requires: pwdutils ps sysstat logdigest -Recommends: logrotate -BuildArch: noarch +Summary: Network-wide graphing framework (node) +Group: System/Monitoring +Requires: logdigest +Requires: perl-HTML-Template +Requires: perl-Log-Log4perl +Requires: perl-Net-SNMP +Requires: perl-Net-SSLeay +Requires: perl-Net-Server +Requires: perl-base = %{perl_version} +Requires: ps +Requires: pwdutils +Requires: sysstat +Recommends: logrotate +BuildArch: noarch %description node Munin is a highly flexible and powerful solution used to create graphs of @@ -110,11 +145,9 @@ unzip %{SOURCE12} unzip %{SOURCE13} %patch - %build %__make - %install %makeinstall %__mkdir_p %{buildroot}/%{_sysconfdir}/munin/plugins @@ -248,7 +281,6 @@ fi %{insserv_cleanup} %endif - %files %defattr(-, root, root) %doc ChangeLog COPYING README UPGRADING @@ -324,7 +356,6 @@ fi %attr(0750, munin, munin) %dir %{logdir} %attr(0755, munin, munin) %dir %{dbdir} - %files node %defattr(-, root, root) %doc README.nginx README.gsa @@ -414,76 +445,4 @@ fi %attr(0755, munin, munin) %dir %{dbdir} %attr(0775, nobody, nobody) %dir %{dbdir}/plugin-state - %changelog -* Wed Jun 09 2010 Detlef Reichelt - 1.4.5 -- new upstream version <1.4.5> - * bugfix release -* Sat Mar 06 2010 Detlef Reichelt - 1.4.4 -- new upstream version <1.4.4> -* Thu Dec 31 2009 Detlef Reichelt - 1.4.3 -- new upstream release <1.4.3> -* Mon Dec 21 2009 Detlef Reichelt - 1.4.2 -- new upstream release <1.4.2> -* Mon Dec 07 2009 Detlef Reichelt - 1.4.1 -- new upstream release <1.4.1> -* Sat Nov 28 2009 Detlef Reichelt - 1.4.0 -- new upstream release <1.4.0> -* Sat Dec 27 2008 Detlef Reichelt 1.2.6 -- add UTF8 patch -* Sat Jul 19 2008 Detlef Reichelt <1.2.6>-<0.pm.1> -- new upstream release <1.2.6> -* Wed Aug 15 2007 Detlef Reichelt <1.2.5>-<0.pm.1> -- new upstream release <1.2.5> -* Mon Oct 17 2005 Detlef Reichelt -- Fixed missing /sbin/rcmunin-node -* Sun Oct 16 2005 Detlef Reichelt -- First build for packman -* Mon Apr 3 2005 Rune Nordbe Skillingstad -- 1.2.3 release -* Fri Apr 1 2005 Rune Nordbe Skillingstad -- 1.2.2 release -- Fixed SF bug 1164481 (missing /srv/www/htdocs/munin) -- Fixed SF bug 1164477 (patch for Net::Domain on PPC64) -* Fri Mar 11 2005 Rune Nordbe Skillingstad -- 1.2.1 release -* Wed Mar 9 2005 Rune Nordbe Skillingstad -- Fixed erronumous path to web directory -- Added start of node if not running -* Thu Mar 8 2005 Rune Nordbe Skillingstad -- Fixed some build path problems -* Thu Feb 24 2005 Rune Nordbe Skillingstad -- New major release -* Wed Feb 9 2005 Rune Nordbe Skillingstad -- Updated to version 1.2.0rc2. -- Removed Nagios stuff -- Added noreplace for some central configuration files -* Thu Nov 18 2004 Rune Nordbe Skillingstad -- Updated to version 1.0.4 -* Mon Nov 08 2004 Rune Nordbe Skillingstad -- Updated version 1.0.3 / sync with redhat-build -* Wed Aug 04 2004 Rune Nordbe Skillingstad -- Initial SuSE build -* Sun Feb 01 2004 Ingvar Hagelund -- Sync with CVS. Version 1.0.0pre2 -* Sun Jan 18 2004 Ingvar Hagelund -- Sync with CVS. Change names to munin. -* Fri Oct 31 2003 Ingvar Hagelund -- Lot of small fixes. Now builds on more RPM distros -* Wed May 21 2003 Ingvar Hagelund -- Sync with CVS -- 0.9.5-1 -* Tue Apr 1 2003 Ingvar Hagelund -- Sync with CVS -- Makefile-based install of core files -- Build doc (only pod2man) -* Thu Jan 9 2003 Ingvar Hagelund -- Sync with CVS, auto rpmbuild -* Thu Jan 2 2003 Ingvar Hagelund -- Fix spec file for RedHat 8.0 and new version of lrrd -* Wed Sep 4 2002 Ingvar Hagelund -- Small bugfixes in the rpm package -* Tue Jun 18 2002 Kjetil Torgrim Homme -- new package - -