SPECS: munin.spec - rel 1.1 - more R: - added plugins patch with p...

[baggins]

Author: baggins                      Date: Sun Oct  9 12:10:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 1.1
- more R:
- added plugins patch with plugins fixes and configs
- don't duplicate plugins configs (symlink is just enough)
- attr 640 for plugins config (passwords may be stored there, eg squid)

---- Files affected:
SPECS:
   munin.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/munin.spec
diff -u SPECS/munin.spec:1.21 SPECS/munin.spec:1.22
--- SPECS/munin.spec:1.21	Fri Oct  7 17:24:31 2005
+++ SPECS/munin.spec	Sun Oct  9 14:10:25 2005
@@ -10,7 +10,7 @@
 Summary(pl):	Munin - agent danych RRD Linpro
 Name:		munin
 Version:	1.3.2
-Release:	1
+Release:	1.1
 License:	GPL
 Group:		Daemons
 Source0:	http://dl.sourceforge.net/munin/%{name}_%{version}.tar.gz
@@ -19,6 +19,7 @@
 Source2:	%{name}.cron
 Source3:	%{name}-apache.conf
 Patch0:		%{name}-Makefile.patch
+Patch1:		%{name}-plugins.patch
 URL:		http://munin.sourceforge.net/
 BuildRequires:	htmldoc
 BuildRequires:	html2text
@@ -72,7 +73,9 @@
 Group:		Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-common = %{version}-%{release}
+Requires:	logtool
 #Requires:	perl-Config-General
+Requires:	perl-Net-Netmask
 Requires:	perl-Net-Server
 Requires:	perl-Net-SNMP
 Requires:	perl-libwww
@@ -90,6 +93,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} build
@@ -109,7 +113,7 @@
 install node/node.d/README README.plugins
 
 install dists/tarball/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install dists/tarball/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}/plugin-conf.d/munin-node
+ln -sf %{_sysconfdir}/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}/plugin-conf.d/munin-node
 
 install server/munin-htaccess $RPM_BUILD_ROOT%{htmldir}/.htaccess
 install server/style.css $RPM_BUILD_ROOT%{htmldir}/
@@ -197,8 +201,8 @@
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/plugins
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/munin-node.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin-conf.d/munin-node
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin-conf.d/munin-node
 %attr(754,root,root) /etc/rc.d/init.d/munin-node
 %attr(755,root,root) %{_sbindir}/munin-run
 %attr(755,root,root) %{_sbindir}/munin-node
@@ -220,6 +224,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2005/10/09 12:10:25  baggins
+- rel 1.1
+- more R:
+- added plugins patch with plugins fixes and configs
+- don't duplicate plugins configs (symlink is just enough)
+- attr 640 for plugins config (passwords may be stored there, eg squid)
+
 Revision 1.21  2005/10/07 15:24:31  baggins
 - BR sed removed (duplicate wrt rpm-build)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/munin.spec?r1=1.21&r2=1.22&f=u