OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Sep-2006 22:16:25
Branch: HEAD Handle: 2006091721162400
Modified files:
openpkg-src/mediaproxy mediaproxy.spec rc.mediaproxy
Log:
some style cosmetics to align even more with the other existing
packages
Summary:
Revision Changes Path
1.2 +37 -37 openpkg-src/mediaproxy/mediaproxy.spec
1.2 +2 -2 openpkg-src/mediaproxy/rc.mediaproxy
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mediaproxy/mediaproxy.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 mediaproxy.spec
--- openpkg-src/mediaproxy/mediaproxy.spec 17 Sep 2006 19:38:00 -0000
1.1
+++ openpkg-src/mediaproxy/mediaproxy.spec 17 Sep 2006 20:16:24 -0000
1.2
@@ -24,14 +24,14 @@
# package information
Name: mediaproxy
-Summary: NAT traversal solution for OpenSER and SIP Express Router
+Summary: NAT Traversal Solution for SIP Express Router
URL: http://www.ag-projects.com/MediaProxy.html
Vendor: AG Projects
Packager: OpenPKG
Distribution: OpenPKG
Class: JUNK
Group: Network
-License: GPLv2
+License: GPL
Version: 1.7.2
Release: 20060917
@@ -49,7 +49,9 @@
AutoReqProv: no
%description
- MediaProxy is a far-end NAT traversal solution for OpenSER and SIP
Express Router
+ MediaProxy is a far-end NAT traversal solution for SIP Express
+ Router ([Open]SER). The proxy server is meant to be used in
+ conjunction with [Open]SER's "mediaproxy" module.
%track
prog mediaproxy = {
@@ -62,52 +64,50 @@
%setup -q -n mediaproxy
%patch -p1
%{l_shtool} subst \
- -e 's;mediaproxy.ini;%{l_prefix}/etc/mediaproxy/mediaproxy.ini;g' \
- modules/configuration.py
+ -e 's;mediaproxy.ini;%{l_prefix}/etc/mediaproxy/mediaproxy.ini;g' \
+ modules/configuration.py
%{l_shtool} subst \
- -e
's;/var/run/mediaproxy.sock;%{l_prefix}/var/mediaproxy/mediaproxy.sock;g' \
- -e
's;/var/run/proxydispatcher.sock;%{l_prefix}/var/mediaproxy/proxydispatcher.sock;g'
\
- -e
's;/var/run/mediaproxy.pid;%{l_prefix}/var/mediaproxy/mediaproxy.pid;g' \
- -e
's;/var/run/proxydispatcher.pid;%{l_prefix}/var/mediaproxy/proxydispatcher.pid;g'
\
- -e 's;openser;%{l_rgrp};g' \
- sessions.py utils/fakeconversations.py utils/rtpgenerator.py \
- modules/dispatcher.py modules/rtphandler.py \
- mediaproxy.py proxydispatcher.py mediaproxy.ini.sample
+ -e
's;/var/run/mediaproxy.sock;%{l_prefix}/var/mediaproxy/mediaproxy.sock;g' \
+ -e
's;/var/run/proxydispatcher.sock;%{l_prefix}/var/mediaproxy/proxydispatcher.sock;g'
\
+ -e
's;/var/run/mediaproxy.pid;%{l_prefix}/var/mediaproxy/mediaproxy.pid;g' \
+ -e
's;/var/run/proxydispatcher.pid;%{l_prefix}/var/mediaproxy/proxydispatcher.pid;g'
\
+ -e 's;openser;%{l_rgrp};g' \
+ sessions.py utils/fakeconversations.py utils/rtpgenerator.py \
+ modules/dispatcher.py modules/rtphandler.py \
+ mediaproxy.py proxydispatcher.py mediaproxy.ini.sample
%build
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/modules \
- $RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/utils \
- $RPM_BUILD_ROOT%{l_prefix}/etc/mediaproxy \
- $RPM_BUILD_ROOT%{l_prefix}/var/mediaproxy \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin \
+
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/modules \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/utils
\
+ $RPM_BUILD_ROOT%{l_prefix}/etc/mediaproxy \
+ $RPM_BUILD_ROOT%{l_prefix}/var/mediaproxy \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
cp -f *.py
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/
cp -f utils/*.py
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/utils/
cp -f modules/*.py
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/modules/
cp -rf modules/external \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/modules/
+
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/modules/
cp -f mediaproxy.ini.sample
$RPM_BUILD_ROOT%{l_prefix}/etc/mediaproxy/mediaproxy.ini
-
- ln -s %{l_prefix}/lib/python/site-packages/mediaproxy/mediaproxy.py \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/mediaproxy
- ln -s %{l_prefix}/lib/python/site-packages/mediaproxy/proxydispatcher.py
\
- $RPM_BUILD_ROOT%{l_prefix}/sbin/proxydispatcher
- ln -s %{l_prefix}/lib/python/site-packages/mediaproxy/sessions.py \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/rtpsessions
- ln -s
%{l_prefix}/lib/python/site-packages/mediaproxy/utils/fakeconversations.py \
- $RPM_BUILD_ROOT%{l_prefix}/bin/fakeconversations
- ln -s
%{l_prefix}/lib/python/site-packages/mediaproxy/utils/rtpgenerator.py \
- $RPM_BUILD_ROOT%{l_prefix}/bin/rtpgenerator
-
+ ln
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/mediaproxy.py \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/mediaproxy
+ ln
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/proxydispatcher.py
\
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/proxydispatcher
+ ln
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/sessions.py \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/rtpsessions
+ ln
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/utils/fakeconversations.py
\
+ $RPM_BUILD_ROOT%{l_prefix}/bin/fakeconversations
+ ln
$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages/mediaproxy/utils/rtpgenerator.py
\
+ $RPM_BUILD_ROOT%{l_prefix}/bin/rtpgenerator
%{l_shtool} install -c -m 755 %{l_value -s -a} \
- %{SOURCE rc.mediaproxy} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mediaproxy'
+ %{SOURCE rc.mediaproxy} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mediaproxy'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mediaproxy/rc.mediaproxy
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.mediaproxy
--- openpkg-src/mediaproxy/rc.mediaproxy 17 Sep 2006 19:56:37 -0000
1.1
+++ openpkg-src/mediaproxy/rc.mediaproxy 17 Sep 2006 20:16:24 -0000
1.2
@@ -30,7 +30,7 @@
rcService mediaproxy enable yes || exit 0
rcService mediaproxy active yes && exit 0
if rcVarIsYes mediaproxy_dispatcher; then
- @l_prefix@/bin/python @l_prefix@/sbin/proxydispatcher
+ @l_prefix@/bin/python @l_prefix@/sbin/proxydispatcher
fi
@l_prefix@/bin/python @l_prefix@/sbin/mediaproxy
@@ -39,7 +39,7 @@
rcService mediaproxy active no && exit 0
mediaproxy_signal TERM
if rcVarIsYes mediaproxy_dispatcher; then
- proxydispatcher_signal TERM
+ proxydispatcher_signal TERM
fi
sleep 2
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
