packages: opensips/opensips.spec - mibs installed to system mibs dir, add m...

[glen]

Author: glen                         Date: Mon Jan 11 13:38:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mibs installed to system mibs dir, add mibs package; rel 2

---- Files affected:
packages/opensips:
   opensips.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/opensips/opensips.spec
diff -u packages/opensips/opensips.spec:1.16 packages/opensips/opensips.spec:1.17
--- packages/opensips/opensips.spec:1.16	Fri Aug 28 10:01:51 2009
+++ packages/opensips/opensips.spec	Mon Jan 11 14:38:00 2010
@@ -9,12 +9,12 @@
 %bcond_without	ldap		# LDAP support
 %bcond_with	osp		# ETSI OSP VoIP Peering support
 %bcond_without	geoip		# GeoIP
-#
+
 Summary:	SIP proxy, redirect and registrar server
 Summary(pl.UTF-8):	Serwer SIP rejestrujący, przekierowujący i robiący proxy
 Name:		opensips
 Version:	1.5.3
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://opensips.org/pub/opensips/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -25,10 +25,10 @@
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_osp:BuildRequires:	OSPToolkit}
 BuildRequires:	bison
+BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	flex
 %{?with_carrierroute:BuildRequires:	libconfuse-devel}
-BuildRequires:	curl-devel
 %{?with_pgsql:BuildRequires:	libpqxx-devel}
 BuildRequires:	libxml2-devel
 %{?with_mysql:BuildRequires:	mysql-devel}
@@ -138,7 +138,7 @@
 Requires:	%{name} = %{version}-%{release}
 
 %description ldap
-LDAP and H350  modules for openSIPS.
+LDAP and H350 modules for openSIPS.
 
 %description ldap -l pl.UTF-8
 Moduły LDAP i H350 do openSIPS.
@@ -191,16 +191,18 @@
 %description snmpstats -l pl.UTF-8
 Moduł do statystyk SNMP do openSIPS.
 
-%package mibs
+%package -n mibs-%{name}
 Summary:	MIBs for openSIPS
 Summary(pl.UTF-8):	MIB-y dla openSIPS
 Group:		Applications/System
+Requires:	mibs-dirs
 Requires:	net-snmp-mibs
+Obsoletes:	opensips-mibs
 
-%description mibs
+%description -n mibs-%{name}
 MIBs for openSIPS.
 
-%description mibs -l pl.UTF-8
+%description -n mibs-%{name} -l pl.UTF-8
 MIB-y dla openSIPS.
 
 %prep
@@ -255,7 +257,8 @@
 	prefix="%{_prefix}" \
 	basedir=$RPM_BUILD_ROOT \
 	cfg-prefix=$RPM_BUILD_ROOT \
-	cfg-target=/etc/opensips/
+	cfg-target=/etc/opensips/ \
+	INSTALLMIBDIR=$RPM_BUILD_ROOT%{_datadir}/mibs
 
 for i in modules/*; do \
 	i=$(basename $i)
@@ -283,7 +286,7 @@
 
 %post
 /sbin/chkconfig --add opensips
-%service opensips restart "sip Daemon"
+%service opensips restart "SIP Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -462,9 +465,9 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/perl.so
 %attr(755,root,root) %{_libdir}/opensips/modules/perlvdb.so
 
-%files mibs
+%files -n mibs-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/snmp/mibs/*
+%{_datadir}/mibs/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -472,6 +475,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/01/11 13:38:00  glen
+- mibs installed to system mibs dir, add mibs package; rel 2
+
 Revision 1.16  2009/08/28 08:01:51  jajcus
 - Version: 1.5.3
 
@@ -479,7 +485,7 @@
 - Version: 1.5.2
 
 Revision 1.14  2009/04/21 07:21:12  jajcus
-Version: 1.5.1
+- Version: 1.5.1
 
 Revision 1.13  2009/03/30 11:30:41  jajcus
 - Release: 3
@@ -522,4 +528,3 @@
 
 Revision 1.1  2008/08/22 13:19:16  jajcus
 - new spec, based on openser.spec
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opensips/opensips.spec?r1=1.16&r2=1.17&f=u