From ff70bf03b71b9d9f91c3048e6067ce3efe339fcc0cdb724f8322bc9883b6a5ae Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 4 Aug 2010 21:35:05 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/audacity revision 35.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=90a22513b5c1d7cbfd2fe9e2f1c1f4a2 --- audacity-license-nyquist | 33 +++++++++++++++++++++++++++++++++ audacity.changes | 6 ++++++ audacity.spec | 6 ++++-- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 audacity-license-nyquist diff --git a/audacity-license-nyquist b/audacity-license-nyquist new file mode 100644 index 0000000..6fa12c2 --- /dev/null +++ b/audacity-license-nyquist @@ -0,0 +1,33 @@ +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 305029b..4959a99 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 591ea72..f1085fd 100644 --- a/audacity.spec +++ b/audacity.spec @@ -42,13 +42,14 @@ BuildRequires: libtwolame-devel %endif Summary: A Free, Cross-Platform Digital Audio Editor Version: 1.3.12 -Release: 3 +Release: 6 License: GPLv2+ Group: Productivity/Multimedia/Sound/Editors and Convertors 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 @@ -74,6 +75,7 @@ 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/*/.}} @@ -119,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) -%doc LICENSE.txt README.txt +%doc LICENSE.txt README.txt LICENSE_NYQUIST.txt %doc %{_mandir}/man?/* %{_bindir}/audacity %{_datadir}/audacity