[opensips/el5: 6/6] Merge branch 'master' into el5

[Peter Lemenkov]

commit db9a91887291507091e609a174f4e884d1e8315e
Merge: 3867fd4 f0d75b0
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Apr 19 13:19:25 2012 +0400

    Merge branch 'master' into el5
    
    Conflicts:
    	opensips.spec

 .gitignore                                         |    1 +
 ...ps-0001-Check-for-stale-nonce-in-pre_auth.patch |    8 +-
 ...-unknown-options-to-be-passed-to-rtpproxy.patch |   31 ++++++++
 opensips.service                                   |   12 +++
 opensips.spec                                      |   75 ++++++++++++++++++--
 sources                                            |    2 +-
 6 files changed, 119 insertions(+), 10 deletions(-)
---
diff --cc opensips.spec
index 70fc6f5,d75b6d4..02c623a
--- a/opensips.spec
+++ b/opensips.spec
@@@ -589,10 -607,23 +607,24 @@@ install -D -p -m 644 %{SOURCE1} $RPM_BU
  rm -rf $RPM_BUILD_ROOT
  
  %post
+ %if 0%{?fc17}%{?fc18}
+ if [ $1 -eq 1 ] ; then
+     # Initial installation
+     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ fi
+ %else
  /sbin/chkconfig --add opensips
 +/bin/sed -i".withxlog" '/^\s*loadmodule\s*\"xlog.so\"/d' /etc/opensips/opensips.cfg
+ %endif
  
  %preun
+ %if 0%{?fc17}%{?fc18}
+ if [ $1 -eq 0 ] ; then
+     # Package removal, not upgrade
+     /bin/systemctl --no-reload disable couchdb.service > /dev/null 2>&1 || :
+     /bin/systemctl stop couchdb.service > /dev/null 2>&1 || :
+ fi
+ %else
  if [ $1 = 0 ]; then
   /sbin/service opensips stop > /dev/null 2>&1
   /sbin/chkconfig --del opensips