- rel 3; enable lm_sensors and diskio on x86/x86_64; add snmp.config

Changed files:
    net-snmp.spec -> 1.61

diff --git a/net-snmp.spec b/net-snmp.spec
index 7ed4772d490c95375d29ec55b4de8eadaa641328..a07ef0c2125603b182aaaa0894d5103e0356a61e 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -11,7 +11,7 @@ Summary(ru):  
 Summary(uk):   îÁÂ¦Ò ÕÔÉÌ¦Ô ÄÌÑ ÐÒÏÔÏËÏÌÕ SNMP ×¦Ä UC-Davis
 Name:          net-snmp
 Version:       5.2.1.2
-Release:       2
+Release:       3
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ BuildRequires:        automake
 BuildRequires: elfutils-devel
 BuildRequires: libtool >= 1.4
 BuildRequires: libwrap-devel
+BuildRequires: lm_sensors-devel
 BuildRequires: openssl-devel >= 0.9.7d
 %{?with_autodeps:BuildRequires:        perl-Term-ReadKey}
 BuildRequires: perl-devel >= 1:5.8.0
@@ -387,6 +388,9 @@ Przegl
        --with-transports="UDP UDPIPv6 TCP TCPIPv6 Unix Callback " \
        --with-sys-location="Unknown" \
        --with-mib-modules="host disman/event-mib smux mibII/mta_sendmail \
+%ifarch %{ix86} %{x8664}
+               ucd-snmp/lmSensors ucd-snmp/diskio \
+%endif
                agentx target misc/ipfwacc tunnel" \
        --with-libwrap \
        --with-openssl \
@@ -450,6 +454,7 @@ install -d $RPM_BUILD_ROOT{/etc/{snmp,rc.d/init.d,sysconfig},/var/log}
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
 :> $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.local.conf
+:> $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmp.conf
 :> $RPM_BUILD_ROOT%{logfile}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/snmpd
@@ -637,6 +642,8 @@ fi
 %{_mandir}/man5/snmp.conf.5*
 %{_mandir}/man5/snmp_config.5*
 
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/snmp/snmp.conf
+
 %files -n perl-SNMP
 %defattr(644,root,root,755)
 %doc perl/SNMP/{BUG,README,TODO} perl/SNMP/examples