X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=opensips.spec;h=8c1023c06651c03747ecaa0c6fe32877baf6df72;hb=3463c3d;hp=743dba6880f84d6eafd82b02ed3729773de19eb2;hpb=1385cae085dce2d989536de258c6ff3a0f1ddf07;p=packages%2Fopensips.git

diff --git a/opensips.spec b/opensips.spec
index 743dba6..8c1023c 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -22,7 +22,7 @@ Summary:	SIP proxy, redirect and registrar server
 Summary(pl.UTF-8):	Serwer SIP przekazujący (proxy), przekierowujący i rejestrujący
 Name:		opensips
 Version:	2.4.0
-Release:	1
+Release:	6
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://opensips.org/pub/opensips/%{version}/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ Source2:	%{name}.sysconfig
 Source3:	%{name}.service
 Patch0:		x32.patch
 Patch1:		make.patch
+Patch2:		json-c-0.14.patch
 URL:		http://www.opensips.org/
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_osp:BuildRequires:	OSPToolkit}
@@ -49,9 +50,9 @@ BuildRequires:	flex
 %{?with_mongodb:BuildRequires:	libmongo-client-devel}
 %{?with_pgsql:BuildRequires:	libpqxx-devel}
 BuildRequires:	libsctp-devel
+BuildRequires:	libuuid-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-progs
-BuildRequires:	libuuid-devel
 #BuildRequires:	lynx
 %{?with_mysql:BuildRequires:	mysql-devel}
 BuildRequires:	net-snmp-devel
@@ -334,6 +335,10 @@ Interfejs RabbitMQ do openSIPS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+      scripts/dbtextdb/dbtextdb.py
 
 %build
 exclude_modules="%{exclude_modules}"
@@ -397,8 +402,9 @@ LDFLAGS="%{rpmldflags}" \
 	prefix=%{_prefix} \
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_lib} \
-	cfg-prefix=$RPM_BUILD_ROOT \
-	cfg-target=/etc/opensips/ \
+	cfg_prefix=$RPM_BUILD_ROOT \
+	cfg_target=%{_sysconfdir}/opensips/ \
+	RADIUSCLIENT=RADIUSCLIENT \
 	CC="%{__cc}" \
 	CC_EXTRA_OPTS="-I/usr/include/ncurses" \
 	CFLAGS="%{rpmcflags} -Wcast-align"
@@ -416,8 +422,8 @@ exclude_modules="$(cat exclude_modules)"
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_lib} \
 	BASEDIR=$RPM_BUILD_ROOT \
-	cfg-prefix=$RPM_BUILD_ROOT \
-	cfg-target=/etc/opensips/ \
+	cfg_prefix=$RPM_BUILD_ROOT \
+cfg_target=%{_sysconfdir}/opensips/ \
 	INSTALLMIBDIR=$RPM_BUILD_ROOT%{_datadir}/mibs
 
 for i in modules/*; do \
@@ -742,5 +748,6 @@ fi
 %if %{with rabbitmq}
 %files rabbitmq
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/event_rabbitmq.so
 %attr(755,root,root) %{_libdir}/opensips/modules/rabbitmq.so
 %endif