improvements to swinst_apt.patch

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

diff --git a/net-snmp.spec b/net-snmp.spec
index eae6406d5404fb5dbc7172a32389f842c809d30b..2714e82f5cab5351f94c9fa371e4d0e7fa1721c0 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -1,7 +1,6 @@
 # TODO
 # - make noarch -n mibs-net-snmp package (need separate .spec then)
 # - FHS: #define NETSNMP_AGENTX_SOCKET "/var/agentx/master"
-# - php-snmp (and likely other bindings) use only %{_libdir}/libnetsnmp.so.*, move other libs back to main (daemon) package?
 #
 # Conditional build:
 %bcond_without autodeps        # don't BR packages only for deps resolving
@@ -12,7 +11,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 +24,13 @@ 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
+# NOTE: 5.7.x is LTS version
+Version:       5.7.3
+Release:       9
 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
+Patch8:                swinst_apt.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/
@@ -84,15 +82,16 @@ BuildRequires:      rpm-perlprov >= 3.0.3-16
 %endif
 BuildRequires: rpmbuild(macros) >= 1.527
 Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name}-agent-libs = %{version}-%{release}
 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)
 
@@ -160,6 +159,15 @@ NET SNMP libraries.
 %description libs -l pl.UTF-8
 Biblioteki SNMP.
 
+%package agent-libs
+Summary:       The NET-SNMP runtime agent libraries
+Group:         Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+
+%description agent-libs
+The net-snmp-agent-libs package contains the runtime agent libraries
+for shared binaries and applications.
+
 %package devel
 Summary:       The development environment for the net-snmp project
 Summary(es.UTF-8):     Archivos de inclusión y bibliotecas para desarrollo en el SNMP de la UCD
@@ -168,6 +176,7 @@ Summary(pt_BR.UTF-8):       Arquivos de inclusão e bibliotecas para desenvolvimento n
 Summary(ru.UTF-8):     Среда разработки для проекта UCD-SNMP
 Summary(uk.UTF-8):     Середовище розробки для проекту UCD-SNMP
 Group:         Development/Libraries
+Requires:      %{name}-agent-libs = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      elfutils-devel
 %{?with_kerberos5:Requires:    heimdal-devel}
@@ -325,6 +334,7 @@ Summary(ru.UTF-8):  Утилиты управления сетью по SNMP из
 Summary(uk.UTF-8):     Утиліти керування мережею по SNMP з проекту NET-SNMP
 Group:         Applications/System
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-agent-libs = %{version}-%{release}
 Suggests:      mibs-%{name} = %{version}-%{release}
 Obsoletes:     cmu-snmp-utils
 Obsoletes:     ucd-snmp-utils
@@ -357,6 +367,7 @@ como: snmpwalk, snmptest e outros.
 Summary:       SNMP and NetSNMP::* Perl modules
 Summary(pl.UTF-8):     Moduły Perla SNMP oraz NetSNMP::*
 Group:         Development/Languages/Perl
+Requires:      %{name}-agent-libs = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
 Conflicts:     ucd-snmp-utils-perl
 
@@ -433,14 +444,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 +523,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 +542,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 \
@@ -591,6 +599,9 @@ fi
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
+%post  agent-libs -p /sbin/ldconfig
+%postun        agent-libs -p /sbin/ldconfig
+
 %triggerpostun -- ucd-snmp
 /sbin/chkconfig --add snmpd
 
@@ -615,7 +626,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
@@ -640,17 +651,20 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %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.%{so_version}
+%dir %{_sysconfdir}/snmp
+%dir %{_datadir}/snmp
+
+%files agent-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnetsnmpagent.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnetsnmpagent.so.%{so_version}
+%attr(755,root,root) %{_libdir}/libnetsnmphelpers.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnetsnmphelpers.so.%{so_version}
+%attr(755,root,root) %{_libdir}/libnetsnmpmibs.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnetsnmpmibs.so.%{so_version}
+%attr(755,root,root) %{_libdir}/libnetsnmptrapd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnetsnmptrapd.so.%{so_version}
-%dir %{_sysconfdir}/snmp
-%dir %{_datadir}/snmp
 
 %files devel
 %defattr(644,root,root,755)