Author: glen                         Date: Mon Dec 28 13:00:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move mibs to mibs-net-snmp which uses common mibs dir

---- Files affected:
packages/net-snmp:
   net-snmp.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.151 
packages/net-snmp/net-snmp.spec:1.152
--- packages/net-snmp/net-snmp.spec:1.151       Sat Dec 26 15:27:55 2009
+++ packages/net-snmp/net-snmp.spec     Mon Dec 28 14:00:18 2009
@@ -3,7 +3,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
@@ -13,7 +13,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
@@ -23,7 +27,7 @@
 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
@@ -81,7 +85,7 @@
 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
@@ -145,7 +149,7 @@
 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
 
@@ -276,16 +280,18 @@
 %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
@@ -313,7 +319,7 @@
 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
 
@@ -441,6 +447,20 @@
 %{__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 \
@@ -459,14 +479,8 @@
        --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="r...@localhost" \
        --with-sys-location="Unknown" \
@@ -497,6 +511,7 @@
 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
@@ -512,9 +527,6 @@
 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
@@ -552,8 +564,6 @@
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/netsnmp/*.py
 %endif
 
-touch $RPM_BUILD_ROOT%{_datadir}/snmp/mibs/.index
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -672,12 +682,9 @@
 %{_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)
@@ -795,6 +802,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2009/12/28 13:00:18  glen
+- move mibs to mibs-net-snmp which uses common mibs dir
+
 Revision 1.151  2009/12/26 14:27:55  glen
 - missing dir; rel 15
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.151&r2=1.152&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to