- up to 5.4.2.1

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

diff --git a/net-snmp.spec b/net-snmp.spec
index 5b053abe54f57242de971d45b908f5cc7fa83249..bba9ba0318725cf3206cffe8eb9546241a6a2ee4 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -1,13 +1,5 @@
 # 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:
@@ -27,12 +19,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.1
-Release:       15
+Version:       5.4.2.1
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 6c974df7a5a5b1579f72115e6b045bda
+# Source0-md5: 984932520143f0c8bf7b7ce1fc9e1da1
 Source1:       %{name}d.init
 Source2:       %{name}d.conf
 Source3:       %{name}d.sysconfig
@@ -54,7 +46,6 @@ Patch9:               %{name}-python.patch
 Patch10:       %{name}-lvalue.patch
 Patch11:       %{name}-defaultconfig.patch
 Patch12:       %{name}-use-rpm-hrmib.patch
-Patch13:       %{name}-duplicate-ip.patch
 Patch14:       %{name}-lm_sensors_3.patch
 URL:           http://www.net-snmp.org/
 BuildRequires: autoconf >= 2.61-3
@@ -421,7 +412,6 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p0
 %patch14 -p0
 
 %build
@@ -447,6 +437,7 @@ cp -f /usr/share/automake/config.sub .
        --with-bzip2=%{_prefix} \
        --with%{!?with_perl:out}-perl-modules \
        --with%{!?with_python:out}-python-modules \
+       --enable-local-smux \
        --with-mib-modules="host agentx smux mibII/mta_sendmail \
 %ifarch %{ix86} %{x8664}
 %if %{with lm_sensors}
@@ -458,7 +449,7 @@ cp -f /usr/share/automake/config.sub .
        %{?with_kerberos5:--with-security-modules="ksm"} \
        --with-sys-contact="root@localhost" \
        --with-sys-location="Unknown" \
-       --with-transports="UDP UDPIPv6 TCP TCPIPv6 Unix Callback " \
+       --with-transports="UDP UDPIPv6 TCP TCPIPv6 Unix Callback" \
        --with-persistent-directory="/var/lib/net-snmp" \
        --enable-ucd-snmp-compatibility \
        --enable-ipv6 \
@@ -535,6 +526,9 @@ done
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsnmp.a
 %endif
 
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/netsnmp/tests
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/netsnmp/*.py
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -599,13 +593,9 @@ fi
 %attr(755,root,root) %{_libdir}/libnetsnmp.so.*.*
 %attr(755,root,root) %{_libdir}/libnetsnmpagent.so.*.*
 %attr(755,root,root) %{_libdir}/libnetsnmphelpers.so.*.*
-%attr(755,root,root) %{_libdir}/libnetsnmpmibs.so.*.*
-%attr(755,root,root) %{_libdir}/libnetsnmptrapd.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnetsnmp.so.15
 %attr(755,root,root) %ghost %{_libdir}/libnetsnmpagent.so.15
 %attr(755,root,root) %ghost %{_libdir}/libnetsnmphelpers.so.15
-%attr(755,root,root) %ghost %{_libdir}/libnetsnmpmibs.so.15
-%attr(755,root,root) %ghost %{_libdir}/libnetsnmptrapd.so.15
 
 %files devel
 %defattr(644,root,root,755)
@@ -615,13 +605,9 @@ fi
 %attr(755,root,root) %{_libdir}/libnetsnmp.so
 %attr(755,root,root) %{_libdir}/libnetsnmpagent.so
 %attr(755,root,root) %{_libdir}/libnetsnmphelpers.so
-%attr(755,root,root) %{_libdir}/libnetsnmpmibs.so
-%attr(755,root,root) %{_libdir}/libnetsnmptrapd.so
 %{_libdir}/libnetsnmp.la
 %{_libdir}/libnetsnmpagent.la
 %{_libdir}/libnetsnmphelpers.la
-%{_libdir}/libnetsnmpmibs.la
-%{_libdir}/libnetsnmptrapd.la
 %{_includedir}/net-snmp
 %{_datadir}/snmp/mib2c*
 %{_mandir}/man1/mib2c.1*