diff -r 7cc1c5d3b5e7 -r b1bf69b8f573 opensips/opensips.spec
--- a/opensips/opensips.spec	Thu Mar 22 21:04:45 2012 +0100
+++ b/opensips/opensips.spec	Thu Mar 22 21:31:17 2012 +0100
@@ -34,8 +34,8 @@
 Class:        PLUS
 Group:        VoIP
 License:      GPL
-Version:      1.7.1
-Release:      20111120
+Version:      1.7.2
+Release:      20120208
 
 #   package options
 %option       with_cons    yes
@@ -63,10 +63,11 @@
 Source3:      fsl.opensips
 Source4:      opensips.cfg
 Patch0:       opensips.patch
-Patch1:       opensips.patch.dict
-Patch2:       opensips.patch.uac
-Patch3:       opensips.patch.reg
-Patch4:       opensips.patch.rtpproxy
+Patch1:       opensips.patch.ctlrc
+Patch2:       opensips.patch.dict
+Patch3:       opensips.patch.uac
+Patch4:       opensips.patch.reg
+Patch5:       opensips.patch.rtpproxy
 
 #   build information
 Prefix:       %{l_prefix}
@@ -185,8 +186,9 @@
     %patch -p0 -P 1
     %patch -p0 -P 2
     %patch -p0 -P 3
+    %patch -p0 -P 4
     ( cd rtpproxy-%{V_rtpproxy}
-      %patch -p0 -P 4
+      %patch -p0 -P 5
     ) || exit $?
     %{l_shtool} subst \
         -e 's;^#! */bin/sh;#! %{l_prefix}/bin/bash;' \
@@ -195,7 +197,7 @@
         -e 's;^#! */bin/bash;#! %{l_prefix}/bin/bash;' \
         modules/seas/doc/xml2sgml.sh \
         scripts/opensipsdbctl \
-        test/*
+        test/*.sh
     %{l_shtool} subst \
 %if "%{with_dbgmem}" == "yes"
         -e 's;\(-DF_MALLOC\);#\1;' \
@@ -249,20 +251,11 @@
         scripts/opensipsdbctl \
         scripts/opensipsctl
     %{l_shtool} subst \
-        -e 's;\(DB_PATH="\)[^"][^"]*;\1%{l_prefix}/var/opensips/db;' \
-        -e 's;start opensips \(with 64MB share memory\).*;start \1 instead of default 32MB;' \
-        -e 's;\(# STARTOPTIONS=.*\);\1"-m 64";' \
-        scripts/osipsconsolerc \
-        scripts/opensipsctlrc
-    %{l_shtool} subst \
-        -e 's;=/var/run/\(opensips.pid\);=%{l_prefix}/var/opensips/\1;g' \
         -e 's;/var/run/\(opensips.pid\);%{l_prefix}/var/opensips/\1;g' \
         -e 's;\(my \$fifo_reply_path\) = "/tmp/";\1 = "%{l_prefix}/var/opensips/";' \
         -e 's;\(my \$HISTORY_FILE\) = "/tmp/osipsconsole_history";\1 = "%{l_prefix}/var/opensips/osipsconsole_history";' \
         scripts/opensipsctl \
-        scripts/opensipsctlrc \
         scripts/osipsconsole \
-        scripts/osipsconsolerc
     %{l_shtool} subst \
         -e 's;/usr/local;;g' \
         -e 's;\(/etc/opensips/\)\.\(opensipsctlrc\);%{l_prefix}\1\2;g' \
@@ -352,6 +345,9 @@
         -e "s;^\(LIBS=\).*;\1`%{l_prefix}/bin/pkg-config --libs libcurl libxml-2.0`;" \
         modules/xcap_client/Makefile
     %{l_shtool} subst \
+        -e 's;^\(DEFS+= *\);\1 -D__EXTENSIONS__;' \
+        modules/presence_xml/Makefile \
+    %{l_shtool} subst \
         -e 's;^\(DEFS+=\).*\\$;\1 \\;' \
         -e "s;\-I[^ \t][^ \t]*;`%{l_prefix}/bin/pkg-config --cflags-only-I libxml-2.0`;g" \
         -e "s;^\(LIBS=\).*;\1`%{l_prefix}/bin/pkg-config --libs libxml-2.0`;" \
@@ -504,6 +500,7 @@
     ) || exit $?
 
 %install
+    #   clean build cruft
     rm -rf $RPM_BUILD_ROOT
 
     #   select modules