1.1 --- a/opensips/opensips.spec Thu Mar 22 21:04:45 2012 +0100 1.2 +++ b/opensips/opensips.spec Thu Mar 22 21:31:17 2012 +0100 1.3 @@ -34,8 +34,8 @@ 1.4 Class: PLUS 1.5 Group: VoIP 1.6 License: GPL 1.7 -Version: 1.7.1 1.8 -Release: 20111120 1.9 +Version: 1.7.2 1.10 +Release: 20120208 1.11 1.12 # package options 1.13 %option with_cons yes 1.14 @@ -63,10 +63,11 @@ 1.15 Source3: fsl.opensips 1.16 Source4: opensips.cfg 1.17 Patch0: opensips.patch 1.18 -Patch1: opensips.patch.dict 1.19 -Patch2: opensips.patch.uac 1.20 -Patch3: opensips.patch.reg 1.21 -Patch4: opensips.patch.rtpproxy 1.22 +Patch1: opensips.patch.ctlrc 1.23 +Patch2: opensips.patch.dict 1.24 +Patch3: opensips.patch.uac 1.25 +Patch4: opensips.patch.reg 1.26 +Patch5: opensips.patch.rtpproxy 1.27 1.28 # build information 1.29 Prefix: %{l_prefix} 1.30 @@ -185,8 +186,9 @@ 1.31 %patch -p0 -P 1 1.32 %patch -p0 -P 2 1.33 %patch -p0 -P 3 1.34 + %patch -p0 -P 4 1.35 ( cd rtpproxy-%{V_rtpproxy} 1.36 - %patch -p0 -P 4 1.37 + %patch -p0 -P 5 1.38 ) || exit $? 1.39 %{l_shtool} subst \ 1.40 -e 's;^#! */bin/sh;#! %{l_prefix}/bin/bash;' \ 1.41 @@ -195,7 +197,7 @@ 1.42 -e 's;^#! */bin/bash;#! %{l_prefix}/bin/bash;' \ 1.43 modules/seas/doc/xml2sgml.sh \ 1.44 scripts/opensipsdbctl \ 1.45 - test/* 1.46 + test/*.sh 1.47 %{l_shtool} subst \ 1.48 %if "%{with_dbgmem}" == "yes" 1.49 -e 's;\(-DF_MALLOC\);#\1;' \ 1.50 @@ -249,20 +251,11 @@ 1.51 scripts/opensipsdbctl \ 1.52 scripts/opensipsctl 1.53 %{l_shtool} subst \ 1.54 - -e 's;\(DB_PATH="\)[^"][^"]*;\1%{l_prefix}/var/opensips/db;' \ 1.55 - -e 's;start opensips \(with 64MB share memory\).*;start \1 instead of default 32MB;' \ 1.56 - -e 's;\(# STARTOPTIONS=.*\);\1"-m 64";' \ 1.57 - scripts/osipsconsolerc \ 1.58 - scripts/opensipsctlrc 1.59 - %{l_shtool} subst \ 1.60 - -e 's;=/var/run/\(opensips.pid\);=%{l_prefix}/var/opensips/\1;g' \ 1.61 -e 's;/var/run/\(opensips.pid\);%{l_prefix}/var/opensips/\1;g' \ 1.62 -e 's;\(my \$fifo_reply_path\) = "/tmp/";\1 = "%{l_prefix}/var/opensips/";' \ 1.63 -e 's;\(my \$HISTORY_FILE\) = "/tmp/osipsconsole_history";\1 = "%{l_prefix}/var/opensips/osipsconsole_history";' \ 1.64 scripts/opensipsctl \ 1.65 - scripts/opensipsctlrc \ 1.66 scripts/osipsconsole \ 1.67 - scripts/osipsconsolerc 1.68 %{l_shtool} subst \ 1.69 -e 's;/usr/local;;g' \ 1.70 -e 's;\(/etc/opensips/\)\.\(opensipsctlrc\);%{l_prefix}\1\2;g' \ 1.71 @@ -352,6 +345,9 @@ 1.72 -e "s;^\(LIBS=\).*;\1`%{l_prefix}/bin/pkg-config --libs libcurl libxml-2.0`;" \ 1.73 modules/xcap_client/Makefile 1.74 %{l_shtool} subst \ 1.75 + -e 's;^\(DEFS+= *\);\1 -D__EXTENSIONS__;' \ 1.76 + modules/presence_xml/Makefile \ 1.77 + %{l_shtool} subst \ 1.78 -e 's;^\(DEFS+=\).*\\$;\1 \\;' \ 1.79 -e "s;\-I[^ \t][^ \t]*;`%{l_prefix}/bin/pkg-config --cflags-only-I libxml-2.0`;g" \ 1.80 -e "s;^\(LIBS=\).*;\1`%{l_prefix}/bin/pkg-config --libs libxml-2.0`;" \ 1.81 @@ -504,6 +500,7 @@ 1.82 ) || exit $? 1.83 1.84 %install 1.85 + # clean build cruft 1.86 rm -rf $RPM_BUILD_ROOT 1.87 1.88 # select modules