X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=net-snmp.spec;h=8e5dbb9f4d8e6fac455c535873f38111873cbdf8;hb=d7f413400b402a4b465d8e91157341034474e941;hp=eae6406d5404fb5dbc7172a32389f842c809d30b;hpb=fc5655c72f61d83030c81ebf2fed0bf8fec5c55c;p=packages%2Fnet-snmp.git

diff --git a/net-snmp.spec b/net-snmp.spec
index eae6406..8e5dbb9 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -12,7 +12,7 @@
 %bcond_without	python		# don't include Python modules
 %bcond_without	static_libs	# don't build static library
 
-%ifnarch %{ix86} %{x8664}
+%ifnarch %{ix86} %{x8664} x32
 %undefine	with_lm_sensors
 %endif
 
@@ -25,12 +25,12 @@ Summary(pt_BR.UTF-8):	Agente SNMP da UCD
 Summary(ru.UTF-8):	Набор утилит для протокола SNMP от UC-Davis
 Summary(uk.UTF-8):	Набір утиліт для протоколу SNMP від UC-Davis
 Name:		net-snmp
-Version:	5.7.2.1
-Release:	5
+Version:	5.7.3
+Release:	6
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5:	7db683faba037249837b226f64d566d4
+# Source0-md5:	d4a3459e1577d0efa8d96ca70a885e53
 Source1:	%{name}d.init
 Source2:	%{name}d.conf
 Source3:	%{name}d.sysconfig
@@ -39,7 +39,7 @@ Source5:	%{name}trapd.conf
 Source6:	%{name}trapd.sysconfig
 Source7:	ucd-ipchains.tar.gz
 # Source7-md5:	29949f1008f1a04d6efefd5b3ea607da
-Source8:	snmpd.upstart
+Source9:	snmpd.logrotate
 Patch0:		%{name}-acfix.patch
 Patch1:		%{name}-rpm-implicit-libs.patch
 Patch2:		%{name}-config-noflags.patch
@@ -48,14 +48,12 @@ Patch4:		%{name}-link.patch
 Patch5:		%{name}-llinterfaces.patch
 Patch6:		%{name}-kernel_headers.patch
 Patch7:		%{name}-rpmpath.patch
-Patch8:		%{name}-snmpksm.patch
+
 Patch9:		%{name}-python.patch
 Patch10:	%{name}-lvalue.patch
 Patch11:	%{name}-defaultconfig.patch
 Patch12:	%{name}-use-rpm-hrmib.patch
 Patch13:	%{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch14:	%{name}-libnl.patch
-Patch15:	%{name}-libpci-init.patch
 
 Patch17:	%{name}-logging.patch
 URL:		http://www.net-snmp.org/
@@ -87,12 +85,12 @@ Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	/usr/bin/setsid
 Requires:	mibs-%{name} = %{version}-%{release}
-Requires:	pciutils >= 3.1.7-5
 Requires:	rc-scripts >= 0.4.3.0
 Provides:	snmpd
 Obsoletes:	cmu-snmp
 Obsoletes:	snmpd
 Obsoletes:	ucd-snmp
+Conflicts:	pciutils < 3.1.7-5
 Conflicts:	rpm < 4.4.9-43.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -433,14 +431,12 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 %patch17 -p1
 
@@ -514,7 +510,7 @@ bd=$(cd ..; pwd)
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,snmp},/var/log,/var/lib/net-snmp,%{_libdir}/snmp/dlmod}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,logrotate.d,sysconfig,snmp},/var/log,/var/lib/net-snmp,%{_libdir}/snmp/dlmod}
 
 %{__make} -j1 install \
 	mibdir=%{_datadir}/mibs \
@@ -533,8 +529,7 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/snmptrapd
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmptrapd.conf
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
 
-install -d $RPM_BUILD_ROOT/etc/init
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/snmpd.conf
+cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/logrotate.d/snmpd
 
 cd perl
 %{__make} -j1 install \
@@ -615,7 +610,7 @@ fi
 
 %attr(754,root,root) /etc/rc.d/init.d/snmpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/snmpd
-%config(noreplace) %verify(not md5 mtime size) /etc/init/snmpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/snmpd
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/snmp/snmpd.conf
 %attr(640,root,root) %config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/snmp/snmpd.local.conf