- move mibs to mibs-net-snmp which uses common mibs dir

Changed files:
    net-snmp.spec -> 1.152

diff --git a/net-snmp.spec b/net-snmp.spec
index d00d5945ba8c61b67a561b441b3d1b078cb3e23f..613457dcacadda8dadbd592a5b5f5c9096371fce 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -2,7 +2,7 @@
 # - package or remove:
 #   %{_datadir}/snmp/snmp_perl.pl
 # - make noarch -n mibs-net-snmp package, most of the files are same as libsmi packages
-# - make it scan for mibs (if not yet) in /usr/share/mibs (and legacy /usr/share/snmp/mibs)
+# - FHS: #define NETSNMP_AGENTX_SOCKET "/var/agentx/master"
 #
 # Conditional build:
 %bcond_without autodeps        # don't BR packages only for deps resolving
@@ -12,7 +12,11 @@
 %bcond_without perl            # don't include Perl modules and utils
 %bcond_without python          # don't include Python modules
 %bcond_without static_libs     # don't build static library
-#
+
+%ifnarch %{ix86} %{x8664}
+%undefine      with_lm_sensors
+%endif
+
 %include       /usr/lib/rpm/macros.perl
 Summary:       A collection of SNMP protocol tools
 Summary(es.UTF-8):     Agente SNMP de la UCD
@@ -22,7 +26,7 @@ Summary(ru.UTF-8):    Набор утилит для протокола SNMP от U
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
 Version:       5.4.2.1
-Release:       15
+Release:       15.6
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -80,7 +84,7 @@ BuildRequires:        rpm-perlprov >= 3.0.3-16
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      %{name}-mibs = %{version}-%{release}
+Requires:      mibs-%{name} = %{version}-%{release}
 Requires:      /usr/bin/setsid
 Requires:      rc-scripts >= 0.2.0
 Provides:      snmpd
@@ -144,7 +148,7 @@ SNMP, утиліти для запросу та встановлення інф
 Summary:       NET SNMP libraries
 Summary(pl.UTF-8):     Biblioteki SNMP
 Group:         Libraries
-Requires:      %{name}-mibs
+Requires:      mibs-%{name}
 Obsoletes:     net-snmp-compat-libs
 Obsoletes:     ucd-snmp-libs
 
@@ -275,16 +279,18 @@ Statyczne biblioteki UCD-SNMP.
 %description compat-static -l pt_BR.UTF-8
 Bibliotecas estáticas para desenvolvimento com ucd-snmp.
 
-%package mibs
-Summary:       MIB database
+%package -n mibs-net-snmp
+Summary:       Net-SNMP provided MIBs
 Summary(pl.UTF-8):     Baza danych MIB
 Group:         Applications/System
+Requires:      mibs-dirs
+Obsoletes:     net-snmp-mibs
 Conflicts:     ucd-snmp-libs
 
-%description mibs
-MIB database.
+%description -n mibs-net-snmp
+Net-SNMP provided MIBs (Management Information Base).
 
-%description mibs -l pl.UTF-8
+%description -n mibs-net-snmp -l pl.UTF-8
 Baza danych MIB.
 
 %package snmptrapd
@@ -312,7 +318,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}
+Requires:      mibs-%{name} = %{version}-%{release}
 Obsoletes:     cmu-snmp-utils
 Obsoletes:     ucd-snmp-utils
 
@@ -440,6 +446,20 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %{__autoconf}
 %{__autoheader}
 cp -f /usr/share/automake/config.sub .
+
+MIBS="\
+host agentx smux \
+mibII/mta_sendmail \
+disman/event disman/schedule \
+ucd-snmp/diskio \
+target \
+misc/ipfwacc \
+"
+
+%if %{with lm_sensors}
+MIBS="$MIBS ucd-snmp/lmsensorsMib"
+%endif
+
 %configure \
        --disable-debugging \
        --enable-as-needed \
@@ -458,14 +478,8 @@ cp -f /usr/share/automake/config.sub .
        --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}
-                       ucd-snmp/lmsensorsMib \
-%endif
-%endif
-                       disman/event disman/schedule ucd-snmp/diskio \
-                       target misc/ipfwacc" \
+       --with-mibdirs='$HOME/.snmp/mibs:/usr/share/mibs:%{_datadir}/snmp/mibs' \
+       --with-mib-modules="$MIBS" \
        %{?with_kerberos5:--with-security-modules="ksm"} \
        --with-sys-contact="root@localhost" \
        --with-sys-location="Unknown" \
@@ -496,6 +510,7 @@ 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}
 
 %{__make} -j1 install \
+       mibdir=%{_datadir}/mibs \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
@@ -511,9 +526,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/snmptrapd
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmptrapd.conf
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
 
-#install agent/mibgroup/ipfwchains/IPFWCHAINS-MIB.txt \
-#      $RPM_BUILD_ROOT%{_datadir}/snmp/mibs
-
 cd perl
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -551,8 +563,6 @@ 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
 
@@ -671,12 +681,9 @@ fi
 %{_libdir}/libsnmp.a
 %endif
 
-%files mibs
+%files -n mibs-net-snmp
 %defattr(644,root,root,755)
-%dir %{_datadir}/snmp
-%dir %{_datadir}/snmp/mibs
-%{_datadir}/snmp/mibs/*.txt
-%ghost %{_datadir}/snmp/mibs/.index
+%{_datadir}/mibs/*.txt
 
 %files snmptrapd
 %defattr(644,root,root,755)