- change default

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

diff --git a/net-snmp.spec b/net-snmp.spec
index 35c1ea2f34d8693304bcb3ee739e759c74df91e0..a12f337c7b6494a599eb58c11f2ade38a9d75f4f 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -1,6 +1,3 @@
-# TODO
-# - package or remove:
-#   %{_datadir}/snmp/snmp_perl.pl
 #
 # Conditional build:
 %bcond_without autodeps        # don't BR packages only for deps resolving
@@ -20,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:       5
+Release:       9
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -50,11 +47,13 @@ Patch14:    %{name}-lm_sensors_3.patch
 Patch15:       %{name}-subcontainer.patch
 Patch16:       %{name}-netlink.patch
 Patch17:       %{name}-TCP_STATS_CACHE_TIMEOUT.patch
+Patch18:       %{name}-src-dst-confusion.patch
 URL:           http://www.net-snmp.org/
 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
 %{?with_lm_sensors:BuildRequires:      lm_sensors-devel >= 3.0.1}
@@ -156,7 +155,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
@@ -422,6 +421,7 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p3
 
 %build
 %{__libtoolize}
@@ -482,9 +482,9 @@ 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}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,snmp},/var/log,%{_libdir}/snmp/dlmod}
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
@@ -504,7 +504,7 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
 #      $RPM_BUILD_ROOT%{_datadir}/snmp/mibs
 
 cd perl
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/perl-SNMP-%{version}
@@ -540,6 +540,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libsnmp.a
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/netsnmp/*.py
 %endif
 
+touch $RPM_BUILD_ROOT%{_datadir}/snmp/mibs/.index
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -590,6 +592,9 @@ fi
 
 %attr(755,root,root) %{_sbindir}/snmpd
 
+%dir %{_libdir}/snmp
+%dir %{_libdir}/snmp/dlmod
+
 %{_mandir}/man5/snmpd.conf.5*
 %{_mandir}/man5/snmpd.examples.5*
 %{_mandir}/man5/snmpd.internal.5*
@@ -657,6 +662,7 @@ fi
 %defattr(644,root,root,755)
 %dir %{_datadir}/snmp
 %{_datadir}/snmp/mibs
+%ghost %{_datadir}/snmp/mibs/.index
 
 %files snmptrapd
 %defattr(644,root,root,755)