rpms/openser/devel openser.spec,1.3,1.4

[Peter Lemenkov (peter)]

Author: peter

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

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


Index: openser.spec
===================================================================
RCS file: /cvs/extras/rpms/openser/devel/openser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openser.spec	25 Jan 2008 10:52:14 -0000	1.3
+++ openser.spec	26 Jan 2008 10:37:06 -0000	1.4
@@ -29,7 +29,7 @@
 BuildRequires:	postgresql-devel
 
 # required by snmpstats module
-%ifndef %{?disable_snmpstats}
+%if %{undefined disable_snmpstats}
 BuildRequires:	lm_sensors-devel
 %endif
 BuildRequires:	net-snmp-devel
@@ -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
@@ -355,7 +345,7 @@
 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.
 
-%ifndef %{?disable_snmpstats}
+%if %{undefined disable_snmpstats}
 %package	snmpstats
 Summary:	SNMP management interface for the OpenSER
 Group:		System Environment/Daemons
@@ -522,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
@@ -569,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
@@ -616,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
@@ -821,6 +808,10 @@
 %doc docdir/README.xmpp
 
 %changelog
+
+* 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