[sox] removed liblpc10 from source tarball due to licensing uncertainity

Thu Jul 25 09:39:01 UTC 2013

commit bf092e88a589037b7a16f81ac744c71624c066ee
Author: Frantisek Kluknavsky <fkluknav at redhat.com>
Date:   Thu Jul 25 11:39:18 2013 +0200

    removed liblpc10 from source tarball due to licensing uncertainity
    
    - added license file to libgsm
    - fixed bogus dates in changelog

 .gitignore             |    1 +
 sources                |    2 +-
 sox-14.4.1-lpc10.patch |   35 +++++++++++++++++++++++++++++++++++
 sox.spec               |   26 ++++++++++++++++++--------
 4 files changed, 55 insertions(+), 9 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e36fe25..469452c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ sox-14.3.1.tar.gz
 /sox-14.3.2.tar.gz
 /sox-14.4.0.tar.gz
 /sox-14.4.1.tar.gz
+/sox-14.4.1.modified.tar.gz
diff --git a/sources b/sources
index f4e48c5..e51cb6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-670307f40763490a2bc0d1f322071e7a  sox-14.4.1.tar.gz
+ca5845928846e13e9d5cb6de6831f05e  sox-14.4.1.modified.tar.gz
diff --git a/sox-14.4.1-lpc10.patch b/sox-14.4.1-lpc10.patch
new file mode 100644
index 0000000..92b98de
--- /dev/null
+++ b/sox-14.4.1-lpc10.patch
@@ -0,0 +1,35 @@
+diff -up wrk/configure.ac.wrk wrk/configure.ac
+--- wrk/configure.ac.wrk	2013-07-12 17:19:34.079965200 +0200
++++ wrk/configure.ac	2013-07-22 16:53:01.630128139 +0200
+@@ -414,8 +414,6 @@ AC_CHECK_HEADERS(lpc10.h, ,
+     AC_CHECK_LIB(lpc10, create_lpc10_encoder_state, LPC10_LIBS="$LPC10_LIBS -llpc10", found_liblpc10=no)
+ if test "$found_liblpc10" = yes; then
+     AC_DEFINE(EXTERNAL_LPC10, 1, [Define if you are using an external LPC10 library])
+-else
+-    LIBLPC10_LIBADD=../lpc10/liblpc10.la
+ fi
+ AM_CONDITIONAL(EXTERNAL_LPC10, test x$found_liblpc10 = xyes)
+ AC_SUBST(LIBLPC10_LIBADD)
+@@ -603,7 +601,7 @@ AC_SUBST(PLAYRECLINKS)
+ AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_static" = "yes")
+ 
+ dnl Generate output files.
+-AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc)
++AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile msvc9/Makefile msvc10/Makefile sox.pc)
+ AC_OUTPUT
+ 
+ if test "$using_gsm" != "no"; then
+diff -up wrk/Makefile.am.wrk wrk/Makefile.am
+--- wrk/Makefile.am.wrk	2013-07-12 17:17:11.512971143 +0200
++++ wrk/Makefile.am	2013-07-12 17:17:29.990970373 +0200
+@@ -2,8 +2,8 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = lpc10 libgsm src
+-DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
++SUBDIRS = libgsm src
++DIST_SUBDIRS = libgsm src msvc9 msvc10
+ 
+ RM = rm -f
+ 
diff --git a/sox.spec b/sox.spec
index ce154d4..31b7bde 100644
--- a/sox.spec
+++ b/sox.spec
@@ -1,12 +1,15 @@
 Summary: A general purpose sound file conversion tool
 Name: sox
 Version: 14.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Modified source tarball with libgsm license, without unlicensed liblpc10
+#Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source: %{name}/%{name}-%{version}.modified.tar.gz
 URL: http://sox.sourceforge.net/
 Patch0: sox-mcompand_clipping.patch
+Patch1: sox-14.4.1-lpc10.patch
 BuildRequires: libvorbis-devel
 BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel
 BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel
@@ -32,11 +35,13 @@ which will use the SoX sound file format converter.
 %prep
 %setup -q
 %patch0 -p1 -b .clip
+%patch1 -p1 -b .lpc
 #regenerate scripts from older autoconf to support aarch64
 autoreconf -vfi
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --with-dyn-default --with-gsm --includedir=%{_includedir}/sox --disable-static --with-distro=Fedora
+CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" 
+%configure --without-lpc10 --with-dyn-default --with-gsm --includedir=%{_includedir}/sox --disable-static --with-distro=Fedora
 make %{?_smp_mflags}
 
 %install
@@ -70,8 +75,13 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a
 
 
 %changelog
+* Thu Jul 25 2013 Frantisek Kluknavsky <fkluknav at redhat.com> - 14.4.1-4
+- removed liblpc10 from source tarball due to licensing uncertainity
+- added license file to libgsm
+- fixed bogus dates in changelog
+
 * Tue Apr 02 2013 Frantisek Kluknavsky <fkluknav at redhat.com> - 14.4.1-3
-- added autoreconf to replace old scropts => support aarch64
+- added autoreconf to replace old scripts => support aarch64
 
 * Fri Feb 15 2013 Frantisek Kluknavsky <fkluknav at redhat.com> - 14.4.1-2
 - added sox-mcompand_clipping.patch to prevent integer overflow
@@ -257,7 +267,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a
 - remoive unpackaged files from the buildroot
 - lib64'ize
 
-* Fri Jul 18 2002 Bill Nottingham <notting at redhat.com>
+* Thu Jul 18 2002 Bill Nottingham <notting at redhat.com>
 - build against current libvorbis
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -278,7 +288,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a
 * Fri Jan  4 2002 Bill Nottingham <notting at redhat.com> 12.17.3-1
 - update to 12.17.3
 
-* Wed Dec  4 2001 Bill Nottingham <notting at redhat.com>
+* Tue Dec  4 2001 Bill Nottingham <notting at redhat.com>
 - update to 12.17.2
 
 * Thu Aug  9 2001 Bill Nottingham <notting at redhat.com>
@@ -302,7 +312,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a
 - update to 12.17
 - yank out gsm stuff
 
-* Tue Aug  7 2000 Bill Nottingham <notting at redhat.com>
+* Mon Aug  7 2000 Bill Nottingham <notting at redhat.com>
 - fix playing of sounds on cards that don't support mono
 
 * Sat Aug  5 2000 Bill Nottingham <notting at redhat.com>
@@ -351,7 +361,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a
 * Mon Jul 13 1998 Michael Maher <mike at redhat.com>
 - updated source from Chris Bagwell.
 
-* Wed Jun 23 1998 Michael Maher <mike at redhat.com>
+* Tue Jun 23 1998 Michael Maher <mike at redhat.com>
 - made patch to fix the '-e' option. BUG 580
 - added buildroot
 
