- upstream code style (spaces for indent)

[packages/net-snmp.git] / net-snmp.spec

diff --git a/net-snmp.spec b/net-snmp.spec
index 35806d568210fc62a9a01c2fa37638821e60e859..780e60b1c98103ec00c73fb0d2b405321ce1e3ba 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):    Набор утилит для протокола SNMP от U
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
 Version:       5.4.2.1
-Release:       8
+Release:       11
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -49,13 +49,10 @@ Patch16:    %{name}-netlink.patch
 Patch17:       %{name}-TCP_STATS_CACHE_TIMEOUT.patch
 Patch18:       %{name}-src-dst-confusion.patch
 URL:           http://www.net-snmp.org/
-# https://rhn.redhat.com/errata/RHSA-2009-1124.html
-# Needs review:
-BuildRequires: security(CVE-2009-1887/RHSA-2009-1124)
 BuildRequires: autoconf >= 2.61-3
 BuildRequires: automake
 BuildRequires: elfutils-devel
-%{?with_kerberos5:BuildRequires:       krb5-devel}
+%{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: libnl-devel >= 1:1.1
 BuildRequires: libtool >= 1.4
 BuildRequires: libwrap-devel
@@ -65,7 +62,9 @@ BuildRequires:        openssl-devel >= 0.9.7d
 BuildRequires: perl-devel >= 1:5.8.0
 %if %{with python}
 BuildRequires: python-devel
+BuildRequires: python-modules
 BuildRequires: python-setuptools
+BuildRequires: rpm-pythonprov
 %endif
 %if %{with rpm}
 BuildRequires: rpm
@@ -158,7 +157,7 @@ Summary(uk.UTF-8):  Середовище розробки для проекту U
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      elfutils-devel
-%{?with_kerberos5:Requires:    krb5-devel}
+%{?with_kerberos5:Requires:    heimdal-devel}
 Requires:      libwrap-devel
 %{?with_lm_sensors:Requires:   lm_sensors-devel >= 3.0.1}
 Requires:      openssl-devel >= 0.9.7c
@@ -485,7 +484,7 @@ perl -pi -e 's@LD_RUN_PATH="\$\(LD_RUN_PATH\)" @@' */Makefile */*/Makefile
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,snmp},/var/log,%{_libdir}/snmp/dlmod}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,snmp},/var/log,/var/lib/net-snmp,%{_libdir}/snmp/dlmod}
 
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -604,6 +603,8 @@ fi
 %{_mandir}/man5/variables.5*
 %{_mandir}/man8/snmpd.8*
 
+%dir %attr(700,root,root) /var/lib/net-snmp
+
 %attr(640,root,root) %ghost %{logfile}
 
 %files libs
@@ -664,7 +665,7 @@ fi
 %files mibs
 %defattr(644,root,root,755)
 %dir %{_datadir}/snmp
-%{_datadir}/snmp/mibs
+%{_datadir}/snmp/mibs/*.txt
 %ghost %{_datadir}/snmp/mibs/.index
 
 %files snmptrapd