rpms/openser/EL-5 openser.spec,1.9,1.10

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/openser/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4222/EL-5

Modified Files:
	openser.spec 
Log Message:
Merged acc module into main package


Index: openser.spec
===================================================================
RCS file: /cvs/extras/rpms/openser/EL-5/openser.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openser.spec	22 Jan 2008 23:03:53 -0000	1.9
+++ openser.spec	26 Jan 2008 10:36:38 -0000	1.10
@@ -10,7 +10,7 @@
 Summary:	Open Source SIP Server
 Name:		openser
 Version:	1.3.0
-Release:	2.1%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://www.openser.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -45,6 +45,7 @@
 Requires(post):	/sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 Requires(preun):/sbin/service
+Obsoletes:	%{name}-acc
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -59,21 +60,10 @@
 transaction and dialog module, OSP module, statistics support, 
 registrar and user location.
 
-%package	acc
-Summary:	Accounts transactions information to different backends
-Group:		System Environment/Daemons
-Requires:	%{name} = %{version}-%{release}
-Conflicts:	acc_radius
-
-%description	acc
-ACC module is used to account transactions information to different backends 
-like syslog, SQL.
-
 %package	acc_radius
 Summary:	Accounts transactions information with radius support
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
-Conflicts:	acc
 
 %description	acc_radius
 ACC module is used to account transactions information to different backends
@@ -421,6 +411,7 @@
 cp -pRf modules/acc modules/acc_radius
 %patch1
 %patch3
+%patch4 -p1
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -521,6 +512,7 @@
 %doc docdir/README-MODULES
 %doc docdir/README.tls
 
+%{_libdir}/openser/modules/acc.so
 %{_libdir}/openser/modules/alias_db.so
 %{_libdir}/openser/modules/auth.so
 %{_libdir}/openser/modules/auth_db.so
@@ -568,6 +560,7 @@
 %{_libdir}/openser/modules/usrloc.so
 %{_libdir}/openser/modules/xlog.so
 
+%doc docdir/README.acc
 %doc docdir/README.alias_db
 %doc docdir/README.auth
 %doc docdir/README.auth_db
@@ -615,11 +608,6 @@
 %doc docdir/README.usrloc
 %doc docdir/README.xlog
 
-%files acc
-%defattr(-,root,root,-)
-%{_libdir}/openser/modules/acc.so
-%doc docdir/README.acc
-
 %files acc_radius
 %defattr(-,root,root,-)
 %{_libdir}/openser/modules/acc_radius.so
@@ -782,7 +770,7 @@
 %{_libdir}/openser/modules/sms.so
 %doc docdir/README.sms
 
-%if %{undefined disable_snmpstats}
+%ifndef %{?disable_snmpstats}
 %files snmpstats
 %defattr(-,root,root,-)
 %{_libdir}/openser/modules/snmpstats.so
@@ -821,8 +809,11 @@
 
 %changelog
 
-* Wed Jan 23 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.0-2.1
-- rebuild
+* Sat Jan 26 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.0-5
+- Merge of acc module into main package
+
+* Fri Jan 25 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.3.0-4
+- modify and apply forgotten patch4
 
 * Thu Jan 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.3.0-2
 - removed openser.init and replaced by upstream version