rpms/openser/F-10 import.log, 1.6, 1.7 openser--openser_init.diff, 1.1, 1.2 openser.spec, 1.27, 1.28

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/openser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13186/F-10

Modified Files:
	import.log openser--openser_init.diff openser.spec 
Log Message:
Fixed patch for the init-script


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openser/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	12 Nov 2009 15:12:34 -0000	1.6
+++ import.log	16 Nov 2009 12:55:59 -0000	1.7
@@ -4,3 +4,4 @@ openser-1_3_3-1_fc9:HEAD:openser-1.3.3-1
 openser-1_3_3-2_fc9:HEAD:openser-1.3.3-2.fc9.src.rpm:1219917365
 openser-1_3_4-1_fc10:F-10:openser-1.3.4-1.fc10.src.rpm:1228753360
 openser-1_3_4-9_fc11:F-10:openser-1.3.4-9.fc11.src.rpm:1258038667
+openser-1_3_4-10_fc12:F-10:openser-1.3.4-10.fc12.src.rpm:1258376119

openser--openser_init.diff:
 openser.init |   46 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

Index: openser--openser_init.diff
===================================================================
RCS file: /cvs/pkgs/rpms/openser/F-10/openser--openser_init.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openser--openser_init.diff	12 Nov 2009 15:12:35 -0000	1.1
+++ openser--openser_init.diff	16 Nov 2009 12:55:59 -0000	1.2
@@ -1,5 +1,5 @@
---- packaging/fedora/openser.init~	2008-11-24 23:52:32.000000000 +0300
-+++ packaging/fedora/openser.init	2009-11-11 13:48:52.901723897 +0300
+--- packaging/fedora/openser.init.orig	2009-11-16 14:52:34.034758160 +0300
++++ packaging/fedora/openser.init	2009-11-16 14:57:03.860757492 +0300
 @@ -12,28 +12,50 @@
  # Source function library.
  . /etc/rc.d/init.d/functions
@@ -22,7 +22,7 @@
  	echo -n $"Starting $prog: "
 +
 +	# check whether OpenSER was already started
-+	if pidofproc -p $pidfile > /dev/null 2>&1 ; then
++	if status $prog > /dev/null 2>&1 ; then
 +		echo -n "already running" && warning && echo
 +		return 0
 +	fi
@@ -43,12 +43,12 @@
 -	killproc $oser
 +
 +	# check whether OpenSER is running
-+	if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then
++	if ! status $prog > /dev/null 2>&1 ; then
 +		echo -n "not running" && warning && echo
 +		return 0
 +	fi
 +
-+	killproc -p $pidfile 2> /dev/null
++	killproc $prog 2> /dev/null
  	RETVAL=$?
  	echo
 -	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
@@ -62,7 +62,7 @@
  		;;
  	status)
 -		status $oser
-+		status -p $pidfile $prog
++		status $prog
  		RETVAL=$?
  		;;
 -	restart)


Index: openser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openser/F-10/openser.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- openser.spec	12 Nov 2009 15:12:35 -0000	1.27
+++ openser.spec	16 Nov 2009 12:55:59 -0000	1.28
@@ -1,16 +1,18 @@
 %if 0%{?rhel}
 # copied from lm_sensors exclusive arch
 %ifnarch alpha i386 i486 i586 i686 pentium3 pentium4 athlon x86_64
-%define disable_snmpstats snmpstats
+%define disable_snmpstats 1
+%else
+%define disable_snmpstats 0
 %endif
 %endif
 
-%define	EXCLUDE_MODULES	mi_xmlrpc osp %{?disable_snmpstats}
+%define	EXCLUDE_MODULES	mi_xmlrpc osp %{?disable_snmpstats:snmpstats}
 
 Summary:	Open Source SIP Server
 Name:		openser
 Version:	1.3.4
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://www.kamailio.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -32,7 +34,7 @@ BuildRequires:	mysql-devel
 BuildRequires:	postgresql-devel
 
 # required by snmpstats module
-%if %{undefined disable_snmpstats}
+%if 0%{!?disable_snmpstats}
 BuildRequires:	lm_sensors-devel
 %endif
 BuildRequires:	net-snmp-devel
@@ -354,7 +356,7 @@ like SMS confirmation--the gateway can c
 message really reached its destination as a SMS--or multi-part messages--if
 a SIP messages is too long it will be split and sent as multiple SMS.
 
-%if %{undefined disable_snmpstats}
+%if 0%{!?disable_snmpstats}
 %package	snmpstats
 Summary:	SNMP management interface for the OpenSER
 Group:		System Environment/Daemons
@@ -812,7 +814,7 @@ fi
 %{_libdir}/openser/modules/sms.so
 %doc docdir/README.sms
 
-%if %{undefined disable_snmpstats}
+%if 0%{!?disable_snmpstats}
 %files snmpstats
 %defattr(-,root,root,-)
 %{_libdir}/openser/modules/snmpstats.so
@@ -852,6 +854,9 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Mon Nov 16 2009 Peter Lemenkov <lemenkov at gmail.com> 1.3.4-10
+- Fixed patch for the init-script
+
 * Wed Nov 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.3.4-9
 - Added patch for the init-script
 - Added COPYING file