[opensips] - update to 1.6.4 - dropped upstreamed patch (opensips-build.patch) - added new module: presence_cal

Wed Dec 22 21:16:56 UTC 2010

commit 1a094eb5d2da1a473abd3dff94b4eb437856e1d9
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Dec 23 00:16:06 2010 +0300

    - update to 1.6.4
    - dropped upstreamed patch (opensips-build.patch)
    - added new module: presence_callinfo

 .gitignore                                         |    1 +
 ...stall-modules-by-install-modules-all-in-i.patch |   28 ++++++++++++++++++
 0002-fixed-install-modules-doc.patch               |   31 ++++++++++++++++++++
 opensips-1.6.3-build.patch                         |   12 -------
 opensips.spec                                      |   29 +++++++++++++++++-
 sources                                            |    2 +-
 6 files changed, 88 insertions(+), 15 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b78d2b9..b22786f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 opensips-1.6.2-tls_src.tar.gz
 opensips-1.6.3-tls_src.tar.gz
+/opensips-1.6.4-tls_src.tar.gz
diff --git a/0001-replaced-install-modules-by-install-modules-all-in-i.patch b/0001-replaced-install-modules-by-install-modules-all-in-i.patch
new file mode 100644
index 0000000..cf42203
--- /dev/null
+++ b/0001-replaced-install-modules-by-install-modules-all-in-i.patch
@@ -0,0 +1,28 @@
+From 00b0bc763dd3830d066b32aecc233ec4a39241f7 Mon Sep 17 00:00:00 2001
+From: John Khvatov <ivaxer at sgu.ru>
+Date: Wed, 22 Dec 2010 23:14:09 +0300
+Subject: replaced install-modules by install-modules-all in install target
+ - fixes modules documentation installation
+
+
+Signed-off-by: John Khvatov <ivaxer at gmail.com>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 136f450..8ec96ef 100644
+--- a/Makefile
++++ b/Makefile
+@@ -437,7 +437,7 @@ install-app: app mk-install-dirs install-cfg install-bin \
+ install-modules-all: install-modules install-modules-doc
+ 
+ # Install everything (except modules-docbook?)
+-install: install-app install-console install-modules
++install: install-app install-console install-modules-all
+ 
+ 
+ .PHONY: dbschema
+-- 
+1.7.3.2
+
diff --git a/0002-fixed-install-modules-doc.patch b/0002-fixed-install-modules-doc.patch
new file mode 100644
index 0000000..e4a8df1
--- /dev/null
+++ b/0002-fixed-install-modules-doc.patch
@@ -0,0 +1,31 @@
+From 131ea49cfbae3994b8a479f5d55a3858e4266777 Mon Sep 17 00:00:00 2001
+From: John Khvatov <ivaxer at gmail.com>
+Date: Wed, 22 Dec 2010 23:41:38 +0300
+Subject: fixed install-modules-doc
+ - bug: install-modules-doc overwrite global README file
+
+---
+ Makefile |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8ec96ef..7021ae4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -792,11 +792,9 @@ install-modules-doc: $(doc-prefix)/$(doc-dir)
+ 	- at for r in $(modules_basenames) "" ; do \
+ 		if [ -n "$$r" ]; then \
+ 			if [ -f modules/"$$r"/README ]; then \
+-				$(INSTALL_TOUCH)  $(doc-prefix)/$(doc-dir)/README ; \
++				$(INSTALL_TOUCH)  $(doc-prefix)/$(doc-dir)/README."$$r" ; \
+ 				$(INSTALL_DOC)  modules/"$$r"/README  \
+-									$(doc-prefix)/$(doc-dir)/README ; \
+-				mv -f $(doc-prefix)/$(doc-dir)/README \
+-						$(doc-prefix)/$(doc-dir)/README."$$r" ; \
++									$(doc-prefix)/$(doc-dir)/README."$$r" ; \
+ 			fi ; \
+ 		fi ; \
+ 	done 
+-- 
+1.7.3.2
+
diff --git a/opensips.spec b/opensips.spec
index 86a17f7..20ff710 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -9,13 +9,14 @@
 
 Summary:  Open Source SIP Server
 Name:     opensips
-Version:  1.6.3
+Version:  1.6.4
 Release:  4%{?dist}
 License:  GPLv2+
 Group:    System Environment/Daemons
 Source0:  http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
 Source1:  %{name}.sysconfig
-Patch0:   %{name}-1.6.3-build.patch
+Patch0:   0001-replaced-install-modules-by-install-modules-all-in-i.patch
+Patch1:   0002-fixed-install-modules-doc.patch
 URL:      http://opensips.org
 
 BuildRequires:  expat-devel
@@ -327,6 +328,19 @@ Requires: %{name}-xcap_client
 The module does specific handling for notify-subscribe events using xml bodies.
 It is used with the general event handling module, presence.
 
+%package  presence_callinfo
+Summary:  SIMPLE Presence extension
+Group:    System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-presence
+
+%description  presence_callinfo
+The module enables the handling of "call-info" and "line-seize" events inside
+the presence module. It is used with the general event handling module:
+presence and it constructs and adds "Call-Info" headers to notification events.
+To send "call-info" notification to watchers, a third-party application must
+publish "call-info" events to the presence server.
+
 %package  pua
 Summary:  Offer the functionality of a presence user agent client
 Group:    System Environment/Daemons
@@ -504,6 +518,7 @@ clients.
 %prep
 %setup -q -n %{name}-%{version}-tls
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -905,6 +920,11 @@ fi
 %{_libdir}/opensips/modules/presence_xml.so
 %doc docdir/README.presence_xml
 
+%files presence_callinfo
+%defattr(-,root,root,-)
+%{_libdir}/opensips/modules/presence_callinfo.so
+%doc docdir/README.presence_callinfo
+
 %files pua
 %defattr(-,root,root,-)
 %{_libdir}/opensips/modules/pua.so
@@ -990,6 +1010,11 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Wed Dec 22 2010 John Khvatov <ivaxer at fedoraproject.org> - 1.6.4-1
+- dropped upstreamed patch (opensips-build.patch)
+- update to 1.6.4
+- added new module: presence_callinfo
+
 * Sat Oct 30 2010 John Khvatov <ivaxer at fedoraproject.org> - 1.6.3-4
 - rebuild against new libnetsnmp
 
diff --git a/sources b/sources
index c24673e..dd6914b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1388092e66f5f7826f3c27b451b06f80  opensips-1.6.3-tls_src.tar.gz
+d4c00298997e1ecb492871050f7c295e  opensips-1.6.4-tls_src.tar.gz
