rpms/openser/EL-4 openser--openserdbctl.diff, NONE, 1.1 openser.spec, 1.1, 1.2 openser.init, 1.1, NONE
Peter Lemenkov (peter)
fedora-extras-commits at redhat.com
Sat Jan 26 10:37:38 UTC 2008
Author: peter
Update of /cvs/extras/rpms/openser/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4222/EL-4
Modified Files:
openser.spec
Added Files:
openser--openserdbctl.diff
Removed Files:
openser.init
Log Message:
Merged acc module into main package
openser--openserdbctl.diff:
--- NEW FILE openser--openserdbctl.diff ---
diff -ur openser-1.3.0-tls.orig/scripts/openserdbctl openser-1.3.0-tls/scripts/openserdbctl
--- openser-1.3.0-tls.orig/scripts/openserdbctl 2007-12-13 14:37:17.000000000 +0100
+++ openser-1.3.0-tls/scripts/openserdbctl 2008-01-25 11:22:27.000000000 +0100
@@ -10,6 +10,9 @@
### include resource files, if any
+if [ -f /etc/openser/openserctlrc ]; then
+ . /etc/openser/openserctlrc
+fi
if [ -f /usr/local/etc/openser/openserctlrc ]; then
. /usr/local/etc/openser/openserctlrc
fi
Index: openser.spec
===================================================================
RCS file: /cvs/extras/rpms/openser/EL-4/openser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openser.spec 15 Dec 2007 07:02:23 -0000 1.1
+++ openser.spec 26 Jan 2008 10:36:22 -0000 1.2
@@ -1,15 +1,22 @@
-%define EXCLUDE_MODULES mi_xmlrpc osp
+%if 0%{?rhel}
+# copied from lm_sensors exclusive arch
+%ifnarch alpha i386 i486 i586 i686 pentium3 pentium4 athlon x86_64
+%define disable_snmpstats snmpstats
+%endif
+%endif
+
+%define EXCLUDE_MODULES mi_xmlrpc osp %{?disable_snmpstats}
Summary: Open Source SIP Server
Name: openser
Version: 1.3.0
-Release: 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
-Source1: openser.init
Patch1: openser--acc_radius_enable.diff
Patch3: openser--openssl-paths.diff
+Patch4: openser--openserdbctl.diff
URL: http://www.openser.org/
BuildRequires: expat-devel
@@ -20,8 +27,11 @@
BuildRequires: radiusclient-ng-devel
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
+
# required by snmpstats module
+%if %{undefined disable_snmpstats}
BuildRequires: lm_sensors-devel
+%endif
BuildRequires: net-snmp-devel
BuildRequires: unixODBC-devel
BuildRequires: openssl-devel
@@ -35,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
@@ -49,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
@@ -345,6 +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.
+%if %{undefined disable_snmpstats}
%package snmpstats
Summary: SNMP management interface for the OpenSER
Group: System Environment/Daemons
@@ -355,6 +356,7 @@
OpenSER. Specifically, it provides general SNMP queryable scalar statistics,
table representations of more complicated data such as user and contact
information, and alarm monitoring capabilities.
+%endif
%package tlsops
Summary: TLS-relating functions for the OpenSER
@@ -409,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 \
@@ -443,7 +446,7 @@
done
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-%{__install} -p -D -m 755 %{SOURCE1} \
+%{__install} -p -D -m 755 packaging/fedora/openser.init \
$RPM_BUILD_ROOT%{_initrddir}/openser
echo -e "\nETCDIR=\"%{_sysconfdir}/openser\"\n" \
>> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/openserctlrc
@@ -509,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
@@ -556,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
@@ -603,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
@@ -770,6 +770,7 @@
%{_libdir}/openser/modules/sms.so
%doc docdir/README.sms
+%ifndef %{?disable_snmpstats}
%files snmpstats
%defattr(-,root,root,-)
%{_libdir}/openser/modules/snmpstats.so
@@ -779,6 +780,7 @@
%{_datadir}/snmp/mibs/OPENSER-SIP-COMMON-MIB
%{_datadir}/snmp/mibs/OPENSER-SIP-SERVER-MIB
%{_datadir}/snmp/mibs/OPENSER-TC
+%endif
%files tlsops
%defattr(-,root,root,-)
@@ -807,6 +809,19 @@
%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
+
+* Thu Jan 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.3.0-2
+- removed openser.init and replaced by upstream version
+- fixed configuration path for openserdbctl (#428799)
+
+* Sun Jan 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.0-1.4
+- 4th try to remove lm_sensors-devel from EL-[45] at ppc{64}
+
* Thu Dec 13 2007 Peter Lemenkov <lemenkov at gmail.com> 1.3.0-1
- Final ver. 1.3.0
- Removed some leftovers from spec-file
--- openser.init DELETED ---
More information about the fedora-extras-commits
mailing list