- rel 5

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

diff --git a/net-snmp.spec b/net-snmp.spec
index c7e5589b92d6d6b2010808ba9e7f09f982196083..fb8930d01879e8958492d6eb4662c7a001dae879 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -1,4 +1,14 @@
-# TODO: python-netsnmp links with libnetsnmp.so.* installed on builder
+# TODO
+# - package or remove:
+#   %{py_sitedir}/netsnmp/__init__.py
+#   %{py_sitedir}/netsnmp/client.py
+#   %{py_sitedir}/netsnmp/tests/__init__.py
+#   %{py_sitedir}/netsnmp/tests/__init__.pyc
+#   %{py_sitedir}/netsnmp/tests/__init__.pyo
+#   %{py_sitedir}/netsnmp/tests/test.py
+#   %{py_sitedir}/netsnmp/tests/test.pyc
+#   %{py_sitedir}/netsnmp/tests/test.pyo
+#   %{_datadir}/snmp/snmp_perl.pl
 #
 # Conditional build:
 %bcond_without autodeps        # don't BR packages only for deps resolving
@@ -16,12 +26,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.4
+Version:       5.4.1
 Release:       5
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 46d893281056ff476e597659cb91574d
+# Source0-md5: 6c974df7a5a5b1579f72115e6b045bda
 Source1:       %{name}d.init
 Source2:       %{name}d.conf
 Source3:       %{name}d.sysconfig
@@ -33,17 +43,16 @@ Source7:    ucd-ipchains.tar.gz
 Patch0:                %{name}-acfix.patch
 Patch1:                %{name}-rpm-implicit-libs.patch
 Patch2:                %{name}-config-noflags.patch
-Patch3:                %{name}-dlopen-fix.patch
-Patch4:                %{name}-manpage.patch
-Patch5:                %{name}-link.patch
-Patch6:                %{name}-llinterfaces.patch
-Patch7:                %{name}-kernel_headers.patch
-Patch8:                %{name}-rpmpath.patch
-Patch9:                %{name}-snmpksm.patch
-Patch10:       %{name}-python.patch
-Patch11:       %{name}-python-includes.patch
+Patch3:                %{name}-manpage.patch
+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
 URL:           http://www.net-snmp.org/
-BuildRequires: autoconf >= 2.57-3
+BuildRequires: autoconf >= 2.61-3
 BuildRequires: automake
 BuildRequires: elfutils-devel
 %{?with_kerberos5:BuildRequires:       krb5-devel}
@@ -65,6 +74,7 @@ BuildRequires:        rpmbuild(macros) >= 1.176
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-mibs = %{version}-%{release}
 Requires:      /usr/bin/setsid
 Requires:      rc-scripts >= 0.2.0
 Provides:      snmpd
@@ -125,7 +135,7 @@ SNMP, утиліти для запросу та встановлення інф
 Summary:       NET SNMP libraries
 Summary(pl.UTF-8):     Biblioteki SNMP
 Group:         Libraries
-Requires:      %{name}-mibs = %{version}-%{release}
+Requires:      %{name}-mibs
 Obsoletes:     net-snmp-compat-libs
 Obsoletes:     ucd-snmp-libs
 
@@ -145,6 +155,7 @@ Summary(uk.UTF-8):  Середовище розробки для проекту U
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      elfutils-devel
+%{?with_kerberos5:Requires:    krb5-devel}
 Requires:      libwrap-devel
 %{?with_lm_sensors:Requires:   lm_sensors-devel}
 Requires:      openssl-devel >= 0.9.7c
@@ -293,6 +304,7 @@ Summary(ru.UTF-8):  Утилиты управления сетью по SNMP из
 Summary(uk.UTF-8):     Утиліти керування мережею по SNMP з проекту NET-SNMP
 Group:         Applications/System
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-mibs = %{version}-%{release}
 Obsoletes:     cmu-snmp-utils
 Obsoletes:     ucd-snmp-utils
 
@@ -404,7 +416,6 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 
 %build
 %{__libtoolize}
@@ -429,7 +440,7 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
        --with%{!?with_rpm:out}-python-modules \
        --with-mib-modules="host agentx smux mibII/mta_sendmail \
 %ifarch %{ix86} %{x8664}
-%if %{with sensors}
+%if %{with lm_sensors}
                        ucd-snmp/lmSensors \
 %endif
 %endif
@@ -444,9 +455,7 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
        --enable-ipv6 \
        --with%{!?with_rpm:out}-rpm
 
-# build this subdir first. it's causing STRANGE compile failures # otherwise (for me at least). glen
-%{__make} -C agent/mibgroup
-%{__make}
+%{__make} -j1
 
 cd perl
 
@@ -496,6 +505,10 @@ cd ..
 # IP-Filter (non-Linux)
 rm -f $RPM_BUILD_ROOT%{_bindir}/ipf-mod.pl
 
+rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle/Makefile.subs.pl
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Bundle/NetSNMP/.packlist
+
 %clean
 rm -rf $RPM_BUILD_ROOT