Author: glen                         Date: Sat Feb  9 10:41:17 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge; rel 5

---- Files affected:
SPECS:
   net-snmp.spec (1.104.2.3 -> 1.104.2.4) 

---- Diffs:

================================================================
Index: SPECS/net-snmp.spec
diff -u SPECS/net-snmp.spec:1.104.2.3 SPECS/net-snmp.spec:1.104.2.4
--- SPECS/net-snmp.spec:1.104.2.3       Sat Dec 15 20:15:07 2007
+++ SPECS/net-snmp.spec Sat Feb  9 11:41:12 2008
@@ -28,7 +28,7 @@
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
 Version:       5.4.1
-Release:       4
+Release:       5
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -52,6 +52,7 @@
 Patch8:                %{name}-snmpksm.patch
 Patch9:                %{name}-python.patch
 Patch10:       %{name}-lvalue.patch
+Patch11:       %{name}-defaultconfig.patch
 URL:           http://www.net-snmp.org/
 BuildRequires: autoconf >= 2.61-3
 BuildRequires: automake
@@ -71,10 +72,10 @@
 BuildRequires: rpm-devel >= 4.0
 BuildRequires: rpm-perlprov >= 3.0.3-16
 %endif
-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
@@ -135,7 +136,7 @@
 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
 
@@ -155,7 +156,7 @@
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      elfutils-devel
-%{?with_kerberos5:Requires:    heimdal-devel}
+%{?with_kerberos5:Requires:    krb5-devel}
 Requires:      libwrap-devel
 %{?with_lm_sensors:Requires:   lm_sensors-devel}
 Requires:      openssl-devel >= 0.9.7c
@@ -304,6 +305,7 @@
 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
 
@@ -415,6 +417,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %{__libtoolize}
@@ -720,6 +723,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104.2.4  2008-02-09 10:41:12  glen
+- HEAD merge; rel 5
+
 Revision 1.104.2.3  2007-12-15 19:15:07  glen
 - rel 4
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to