diff -r 8ddd39bcf2ec -r b972dc20871f opensips/opensips.spec
--- a/opensips/opensips.spec	Wed Sep 21 14:31:41 2011 +0200
+++ b/opensips/opensips.spec	Wed Sep 21 16:06:14 2011 +0200
@@ -22,6 +22,8 @@
 ##
 
 #   package options
+%define       V_major  1.6.4
+%define       V_minor  2
 %define       V_rtpproxy  1.2.1
 
 #   package information
@@ -34,8 +36,8 @@
 Class:        PLUS
 Group:        VoIP
 License:      GPL
-Version:      1.7.0
-Release:      20110912
+Version:      %{V_major}.%{V_minor}
+Release:      20110200
 
 #   package options
 %option       with_cons    yes
@@ -57,7 +59,7 @@
 %option       with_dbgmem  no
 
 #   list of sources
-Source0:      http://www.opensips.org/pub/opensips/%{version}/src/opensips-%{version}_src.tar.gz
+Source0:      http://www.opensips.org/pub/opensips/%{V_major}/src/opensips-%{V_major}-%{V_minor}-tls_src.tar.gz
 Source1:      http://www.b2bua.org/chrome/site/rtpproxy-%{V_rtpproxy}.tar.gz
 Source2:      rc.opensips
 Source3:      fsl.opensips
@@ -65,8 +67,9 @@
 Patch0:       opensips.patch
 Patch1:       opensips.patch.dict
 Patch2:       opensips.patch.uac
-Patch3:       opensips.patch.reg
-Patch4:       opensips.patch.rtpproxy
+Patch3:       opensips.patch.lcr
+Patch4:       opensips.patch.reg
+Patch5:       opensips.patch.rtpproxy
 
 #   build information
 Prefix:       %{l_prefix}
@@ -166,11 +169,11 @@
 
 %track
     prog opensips = {
-        version   = %{version}
+        version   = %{V_major}-%{V_minor}
         url       = http://www.opensips.org/pub/opensips/
         regex     = (\d+\.\d+\.\d+)/
         url       = http://www.opensips.org/pub/opensips/__NEWVER__/src/
-        regex     = opensips-(__VER__)_src\.tar\.gz
+        regex     = opensips-(__VER__)-tls_src\.tar\.gz
     }
     prog opensips:rtpproxy = {
         version   = %{V_rtpproxy}
@@ -179,14 +182,15 @@
     }
 
 %prep
-    %setup -q -n opensips-%{version}-tls
-    %setup -q -n opensips-%{version}-tls -T -D -a 1
+    %setup -q -n opensips-%{V_major}-%{V_minor}-tls
+    %setup -q -n opensips-%{V_major}-%{V_minor}-tls -T -D -a 1
     %patch -p0
     %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;' \
@@ -302,6 +306,9 @@
         -e 's;\(script_flags(int\));\1,null);' \
         scripts/dbtext/opensips/dialog
     %{l_shtool} subst \
+        -e 's;\(gw_name(string).*\)  *$;\1 user(string,null) realm(string,null) passwd(string,null);' \
+        scripts/dbtext/opensips/gw
+    %{l_shtool} subst \
         -e 's;body(string);body(blob);' \
         -e 's;sender(string);sender(string,null);' \
         scripts/dbtext/opensips/presentity