diff --git a/audacity-license-nyquist b/audacity-license-nyquist deleted file mode 100644 index 6fa12c2..0000000 --- a/audacity-license-nyquist +++ /dev/null @@ -1,33 +0,0 @@ -There are a number of files under the nyquist subdirectory, which -carry a non-commercial license : - -lib-src/libnyquist/nyquist/xlisp/xlcont.c -lib-src/libnyquist/nyquist/xlisp/xldbug.c -lib-src/libnyquist/nyquist/xlisp/xldmem.c -lib-src/libnyquist/nyquist/xlisp/xleval.c -lib-src/libnyquist/nyquist/xlisp/xlfio.c -lib-src/libnyquist/nyquist/xlisp/xlftab.c -lib-src/libnyquist/nyquist/xlisp/xlimage.c -lib-src/libnyquist/nyquist/xlisp/xlinit.c -lib-src/libnyquist/nyquist/xlisp/xlio.c -lib-src/libnyquist/nyquist/xlisp/xlisp.c -lib-src/libnyquist/nyquist/xlisp/xlisp.h -lib-src/libnyquist/nyquist/xlisp/xlmath.c -lib-src/libnyquist/nyquist/xlisp/xlobj.c -lib-src/libnyquist/nyquist/xlisp/xlprin.c -lib-src/libnyquist/nyquist/xlisp/xlread.c -lib-src/libnyquist/nyquist/xlisp/xlstr.c -lib-src/libnyquist/nyquist/xlisp/xlsys.c - -To clarify this licensing here is the response from David: - -"The copyright notices in the source code are intended to suggest that -non-commercial users need not contact me for permission. It is granted -in the source code comments. Originally, commercial users needed -a license and in some cases paid a fee. Now, commercial use is governed -by a BSD-like license as you've mentioned. I guess I should at least -update my copies of the source files to say that but I have no control -over what is floating around the net. - -David Betz" - diff --git a/audacity.changes b/audacity.changes index 4959a99..305029b 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 4 13:46:28 UTC 2010 - mseben@novell.com - -- add LICENSE_NYQUIST.txt to clarify licensing of libnyquist source - files - ------------------------------------------------------------------- Wed May 26 21:59:23 UTC 2010 - cmorve69@yahoo.es diff --git a/audacity.spec b/audacity.spec index a255790..591ea72 100644 --- a/audacity.spec +++ b/audacity.spec @@ -49,7 +49,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://audacity.sourceforge.net/ Source: %{name}-minsrc-%{version}-beta.tar.bz2 Source1: %{name}.png -Source2: %{name}-license-nyquist # PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch cmorve69@yahoo.es -- this patch removes the buildstamp Patch0: %{name}-no_buildstamp.patch Patch5: %{name}-retval.patch @@ -75,7 +74,6 @@ physical memory size of your computer. %patch13 -p1 %patch14 %patch15 -%{__cp} %{S:2} LICENSE_NYQUIST.txt %build #%{?suse_update_config:%{suse_update_config -f . lib-src/*/.}} @@ -121,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) -%doc LICENSE.txt README.txt LICENSE_NYQUIST.txt +%doc LICENSE.txt README.txt %doc %{_mandir}/man?/* %{_bindir}/audacity %{_datadir}/audacity diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000