packages: mediaproxy/mediaproxy.spec, mediaproxy/mediaproxy-kernelversion_d...

[mmazur]

Author: mmazur                       Date: Thu Jun  9 10:56:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix for running on our vanilla kernels :)

---- Files affected:
packages/mediaproxy:
   mediaproxy.spec (1.4 -> 1.5) , mediaproxy-kernelversion_discovery.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mediaproxy/mediaproxy.spec
diff -u packages/mediaproxy/mediaproxy.spec:1.4 packages/mediaproxy/mediaproxy.spec:1.5
--- packages/mediaproxy/mediaproxy.spec:1.4	Tue Apr  5 13:44:42 2011
+++ packages/mediaproxy/mediaproxy.spec	Thu Jun  9 12:56:51 2011
@@ -3,7 +3,7 @@
 Summary:	Media relay for RTP/RTCP and UDP streams
 Name:		mediaproxy
 Version:	2.4.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://download.ag-projects.com/MediaProxy/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Source3:	media-relay.sysconfig
 Source4:	media-relay.init
 Patch0:		%{name}-kernel_headers.patch
+Patch1:		%{name}-kernelversion_discovery.patch
 URL:		http://mediaproxy.ag-projects.com/
 BuildRequires:	libnetfilter_conntrack-devel
 BuildRequires:	python >= 1:2.5
@@ -90,6 +91,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 python setup.py build
@@ -172,6 +174,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/06/09 10:56:51  mmazur
+- rel 2
+- fix for running on our vanilla kernels :)
+
 Revision 1.4  2011/04/05 11:44:42  jajcus
 - Version: 2.4.4
 - patch to fix compatibility with recent linux-libc-headers

================================================================
Index: packages/mediaproxy/mediaproxy-kernelversion_discovery.patch
diff -u /dev/null packages/mediaproxy/mediaproxy-kernelversion_discovery.patch:1.1
--- /dev/null	Thu Jun  9 12:56:56 2011
+++ packages/mediaproxy/mediaproxy-kernelversion_discovery.patch	Thu Jun  9 12:56:51 2011
@@ -0,0 +1,11 @@
+--- mediaproxy-2.4.4/mediaproxy/relay.py.orig	2011-06-09 12:47:39.190215619 +0200
++++ mediaproxy-2.4.4/mediaproxy/relay.py	2011-06-09 12:49:33.578825187 +0200
+@@ -326,7 +326,7 @@
+         if not ip_forward:
+             raise RuntimeError("IP forwarding is not available or not enabled (check %s)" % IP_FORWARD_FILE)
+         try:
+-            major, minor, revision = [int(num) for num in open(KERNEL_VERSION_FILE).read().split("-", 1)[0].split(".")[:3]]
++            major, minor, revision = [int(num) for num in open(KERNEL_VERSION_FILE).read().split("-", 1)[0].split("_", 1)[0].split(".")[:3]]
+         except:
+             raise RuntimeError("Could not determine Linux kernel version")
+         if (major, minor, revision) < (2, 6, 18):
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mediaproxy/mediaproxy.spec?r1=1.4&r2=1.5&f=u