rpms/opal/devel opal-3.6.1-noilbc.patch, NONE, 1.1 opal.spec, 1.46, 1.47 sources, 1.18, 1.19

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4515/devel

Modified Files:
	opal.spec sources 
Added Files:
	opal-3.6.1-noilbc.patch 
Log Message:
drop ilbc for legal reasons

opal-3.6.1-noilbc.patch:

--- NEW FILE opal-3.6.1-noilbc.patch ---
diff -up opal-3.6.1/Makefile.in.BAD opal-3.6.1/Makefile.in
--- opal-3.6.1/Makefile.in.BAD	2009-04-21 13:47:04.000000000 -0400
+++ opal-3.6.1/Makefile.in	2009-04-21 13:47:08.000000000 -0400
@@ -361,7 +361,6 @@ SOURCES += $(OPAL_SRCDIR)/codec/g711code
            $(OPAL_SRCDIR)/codec/g729mf.cxx \
            $(OPAL_SRCDIR)/codec/gsm0610mf.cxx \
            $(OPAL_SRCDIR)/codec/gsmamrmf.cxx \
-           $(OPAL_SRCDIR)/codec/iLBCmf.cxx \
            $(OPAL_SRCDIR)/codec/t38mf.cxx \
            $(OPAL_SRCDIR)/codec/rfc2833.cxx \
            $(OPAL_SRCDIR)/codec/opalwavfile.cxx \


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- opal.spec	18 Mar 2009 06:22:47 -0000	1.46
+++ opal.spec	21 Apr 2009 18:03:43 -0000	1.47
@@ -1,9 +1,15 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.opalvoip.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+# We cannot use unmodified upstream source code because it contains the 
+# non-free iLBC codec.
+# rm -rf plugins/audio/iLBC/
+# rm -rf src/codec/iLBCmf.cxx
+# Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}-noilbc.tar.bz2
+Patch0:		opal-3.6.1-noilbc.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRequires:	ptlib-devel = 2.6.1
@@ -34,6 +40,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1 -b .noilbc
 
 %build
 %configure --prefix=/usr
@@ -68,6 +75,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.1-2
+- pull out ilbc codec due to legal issues
+
 * Wed Mar 18 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.1-1
 - New stable release for ekiga 3.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 Mar 2009 06:22:48 -0000	1.18
+++ sources	21 Apr 2009 18:03:43 -0000	1.19
@@ -1 +1 @@
-c2b4f12822cef2182267ea0d020bddf6  opal-3.6.1.tar.bz2
+3c986b4f6156af482889f0b86e2c4f75  opal-3.6.1-noilbc.tar.bz2