- rel 1

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

diff --git a/net-snmp.spec b/net-snmp.spec
index a4069b012ea91281e024e85fd009069a2896c7bc..9c9fb7043ca7639458a0695d4ac5d396dc4ef407 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -1,14 +1,7 @@
 # TODO:
-# - init scripts
+# - init scripts (which, what?)
 # - default configs
-# - review %%files (add missing)
-# - review Requires:
-# - review Obsoletes:
-# - review Provides:
-# - review ucd patches:
-# -- ia64
-# -- init_master-libwrap
-# - /usr/local/bin/perl fix
+# - review ucd-snmp-ia64.patch patch
 #
 # Conditional build:
 %bcond_without autodeps        # don't BR packages only for deps resolving
@@ -21,12 +14,12 @@ Summary(pt_BR):     Agente SNMP da UCD
 Summary(ru):   îÁÂÏÒ ÕÔÉÌÉÔ ÄÌÑ ÐÒÏÔÏËÏÌÁ SNMP ÏÔ UC-Davis
 Summary(uk):   îÁÂ¦Ò ÕÔÉÌ¦Ô ÄÌÑ ÐÒÏÔÏËÏÌÕ SNMP ×¦Ä UC-Davis
 Name:          net-snmp
-Version:       5.1
-Release:       0.2
+Version:       5.1.1
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 14217471edb2b805b0e28c4c3cfd8c75
+# Source0-md5: 68f6c946387718e4f300cbb8b6c4bd43
 Source1:       %{name}d.init
 Source2:       %{name}d.conf
 Source3:       %{name}d.sysconfig
@@ -45,19 +38,20 @@ Patch6:             %{name}-link.patch
 Patch7:                %{name}-llinterfaces.patch
 Patch8:                %{name}-usr_local_bin_perl.patch
 Patch9:                %{name}-kernel_headers.patch
+Patch10:       %{name}-strtok.patch
 URL:           http://www.net-snmp.org/
 BuildRequires: autoconf >= 2.57-3
 BuildRequires: automake
 BuildRequires: elfutils-devel
 BuildRequires: libtool >= 1.4
 BuildRequires: libwrap-devel
-BuildRequires: openssl-devel >= 0.9.7c
+BuildRequires: openssl-devel >= 0.9.7d
 %{?with_autodeps:BuildRequires:        perl-Term-ReadKey}
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-devel >= 4.0
 BuildRequires: rpm-perlprov >= 3.0.3-16
 PreReq:                rc-scripts >= 0.2.0
-PreReq:                %{name}-libs = %{version}
+PreReq:                %{name}-libs = %{version}-%{release}
 Requires(post,preun):  /sbin/chkconfig
 Requires:      /usr/bin/setsid
 Provides:      snmpd
@@ -117,8 +111,9 @@ SNMP, 
 Summary:       NET SNMP libraries
 Summary(pl):   Biblioteki SNMP
 Group:         Libraries
+Requires:      %{name}-mibs = %{version}-%{release}
+Obsoletes:     net-snmp-libs
 Obsoletes:     ucd-snmp-libs
-Requires:      %{name}-mibs = %{version}
 
 %description libs
 NET SNMP libraries.
@@ -134,7 +129,7 @@ Summary(pt_BR):     Arquivos de inclus
 Summary(ru):   óÒÅÄÁ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ ÐÒÏÅËÔÁ UCD-SNMP
 Summary(uk):   óÅÒÅÄÏ×ÉÝÅ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÒÏÅËÔÕ UCD-SNMP
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      elfutils-devel
 Requires:      openssl-devel >= 0.9.7c
 Obsoletes:     ucd-snmp-devel
@@ -173,7 +168,7 @@ Summary(pt_BR):     Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÅËÔÁ net-snmp
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÅËÔÕ net-snmp
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 Obsoletes:     ucd-snmp-static
 
 %description static
@@ -185,19 +180,6 @@ Statyczne biblioteki net-snmp.
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento com net-snmp.
 
-%package compat-libs
-Summary:       UCD SNMP libraries
-Summary(pl):   Biblioteki UCD SNMP
-Group:         Libraries
-Obsoletes:     ucd-snmp-libs
-Requires:      %{name}-mibs = %{version}
-
-%description compat-libs
-UCD SNMP libraries.
-
-%description compat-libs -l pl
-Biblioteki UCD SNMP.
-
 %package compat-devel
 Summary:       The development environment for the UCD-SNMP project
 Summary(es):   Archivos de inclusión y bibliotecas para desarrollo en el SNMP de la UCD
@@ -206,8 +188,8 @@ Summary(pt_BR):     Arquivos de inclus
 Summary(ru):   óÒÅÄÁ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ ÐÒÏÅËÔÁ UCD-SNMP
 Summary(uk):   óÅÒÅÄÏ×ÉÝÅ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÒÏÅËÔÕ UCD-SNMP
 Group:         Development/Libraries
-Requires:      %{name}-compat-libs = %{version}
-Requires:      openssl-devel >= 0.9.7c
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      openssl-devel >= 0.9.7d
 Obsoletes:     cmu-snmp-devel
 Obsoletes:     ucd-snmp-devel
 
@@ -245,7 +227,7 @@ Summary(pt_BR):     Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÅËÔÁ UCD-SNMP
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÅËÔÕ UCD-SNMP
 Group:         Development/Libraries
-Requires:      %{name}-compat-devel = %{version}
+Requires:      %{name}-compat-devel = %{version}-%{release}
 Obsoletes:     ucd-snmp-static
 
 %description compat-static
@@ -261,6 +243,7 @@ Bibliotecas est
 Summary:       MIB database
 Summary(pl):   Baza danych MIB
 Group:         Applications/System
+Conflicts:     ucd-snmp-libs
 
 %description mibs
 MIB database.
@@ -272,7 +255,7 @@ Baza danych MIB.
 Summary:       SNMP trap daemon
 Summary(pl):   Demon obs³uguj±cy pu³apki SNMP
 Group:         Applications/System
-PreReq:                %{name} = %{version}
+PreReq:                %{name} = %{version}-%{release}
 PreReq:                rc-scripts >= 0.2.0
 Requires(post,preun):  /sbin/chkconfig
 Obsoletes:     cmu-snmp-utils
@@ -292,7 +275,7 @@ Summary(pt_BR):     Utilit
 Summary(ru):   õÔÉÌÉÔÙ ÕÐÒÁ×ÌÅÎÉÑ ÓÅÔØÀ ÐÏ SNMP ÉÚ ÐÒÏÅËÔÁ NET-SNMP
 Summary(uk):   õÔÉ̦ÔÉ ËÅÒÕ×ÁÎÎÑ ÍÅÒÅÖÅÀ ÐÏ SNMP Ú ÐÒÏÅËÔÕ NET-SNMP
 Group:         Applications/System
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     cmu-snmp-utils
 Obsoletes:     ucd-snmp-utils
 
@@ -324,7 +307,8 @@ como: snmpwalk, snmptest e outros.
 Summary:       SNMP and NetSNMP::* Perl modules
 Summary(pl):   Modu³y Perla SNMP oraz NetSNMP::*
 Group:         Development/Languages/Perl
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
+Conflicts:     ucd-snmp-utils-perl
 
 %description -n perl-SNMP
 SNMP and NetSNMP::* Perl modules - Perl interface to net-snmp.
@@ -336,7 +320,7 @@ Modu
 Summary:       Perl utilities for network management using SNMP
 Summary(pl):   Perlowe narzêdzia u¿ywaj±ce protoko³u SNMP
 Group:         Applications/System
-Requires:      perl-SNMP = %{version}
+Requires:      perl-SNMP = %{version}-%{release}
 Obsoletes:     cmu-snmp-utils
 Obsoletes:     ucd-snmp-utils-perl
 
@@ -351,8 +335,8 @@ Perlowe narz
 Summary:       snmpconf - creating and modifying SNMP configuration files
 Summary(pl):   snmpconf - tworzenie i modyfikowanie plików konfiguracyjnych SNMP
 Group:         Applications/System
-Requires:      %{name} = %{version}
-Requires:      perl-SNMP = %{version}
+Requires:      %{name} = %{version}-%{release}
+Requires:      perl-SNMP = %{version}-%{release}
 
 %description snmpconf
 snmpconf is a simple Perl script that walks you through setting up a
@@ -367,7 +351,7 @@ konfiguracyjnego krok po kroku. Powinien by
 Summary:       MIB browser in TK
 Summary(pl):   Przegl±darka MIB-ów w TK
 Group:         Applications/System
-Requires:      perl-SNMP = %{version}
+Requires:      perl-SNMP = %{version}-%{release}
 Requires:      perl-Tk
 
 %description tkmib
@@ -386,8 +370,9 @@ Przegl
 %patch5 -p1
 %patch6 -p1
 %patch7 -p2
-%patch8 -p0
+%patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %{__libtoolize}
@@ -457,9 +442,13 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
 cd perl
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/perl-SNMP-%{version}
 install SNMP/examples/*.pl $RPM_BUILD_ROOT%{_examplesdir}/perl-SNMP-%{version}
 
+# IP-Filter (non-Linux)
+rm -f $RPM_BUILD_ROOT%{_bindir}/ipf-mod.pl
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -484,9 +473,6 @@ fi
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%post  compat-libs -p /sbin/ldconfig
-%postun        compat-libs -p /sbin/ldconfig
-
 %post snmptrapd
 /sbin/chkconfig --add snmptrapd
 if [ -f /var/lock/subsys/snmptrapd ]; then
@@ -539,16 +525,12 @@ fi
 %{_includedir}/net-snmp
 %{_datadir}/snmp/mib2c*
 %{_mandir}/man1/mib2c.1*
-%{_mandir}/man3/*
+%{_mandir}/man3/[!NS]*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libnet*.a
 
-%files compat-libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsnmp.so.*.*
-
 %files compat-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsnmp.so