X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=opensips.spec;h=4f34b8499776e9214d9acb42876f7a0365f5a04a;hb=61d4b00aaab64ba05fca03969024a41297f025d4;hp=6a86e229e3ec7b7f8ac5b0b7bcd42066dcf8e76a;hpb=e28866872fe0a6d9f87cf2b47f75dd44af3e26fd;p=packages%2Fopensips.git

diff --git a/opensips.spec b/opensips.spec
index 6a86e22..4f34b84 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -8,36 +8,44 @@
 %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:	6
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://opensips.org/pub/opensips/%{version}/src/%{name}-%{version}-tls_src.tar.gz
 # Source0-md5:	8a03167420c31da15405bed7630ed3e2
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Patch0:		%{name}-openssl.patch
 URL:		http://www.opensips.org/
 %{?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
+BuildRequires:	libxslt-progs
+#BuildRequires:	lynx
 %{?with_mysql:BuildRequires:	mysql-devel}
 BuildRequires:	net-snmp-devel
 %{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	openssl-devel
+BuildRequires:	pcre-devel
 BuildRequires:	perl-devel
+BuildRequires:	perl-tools-devel
 %{?with_radius:BuildRequires:	radiusclient-ng-devel}
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
+#BuildRequires:	subversion
 %{?with_odbc:BuildRequires:	unixODBC-devel}
+BuildRequires:	which
 #BuildRequires:	xmlrpc-c-devel >= 1.10.0
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
@@ -137,7 +145,7 @@ Group:		Networking/Daemons
 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.
@@ -190,20 +198,23 @@ openSIPS SNMP statistics module.
 %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:	net-snmp-mibs
+Requires:	mibs-dirs
+Requires:	mibs-net-snmp
+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
 %setup -q -n %{name}-%{version}-tls
+%patch0 -p1
 
 find -type d -name CVS | xargs rm -rf
 
@@ -254,7 +265,8 @@ exclude_modules="$(cat exclude_modules)"
 	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)
@@ -282,7 +294,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add opensips
-%service opensips restart "sip Daemon"
+%service opensips restart "SIP Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -461,6 +473,6 @@ fi
 %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/*