diff --git a/csound.changes b/csound.changes index d78a2c9..e7d1000 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 5 13:57:01 UTC 2019 - Dave Plater + +- Remove undistributable scansyn files from source. +- Relicenced to GPL-2.0-or-later AND BSD-2-Clause, there is one + GPL-2.0 or later source file which relicenses the LGPL sources + and one BSD 2 clause file + ------------------------------------------------------------------- Sat Apr 6 11:05:19 UTC 2019 - plater diff --git a/csound.spec b/csound.spec index 4da0dac..1c6fa84 100644 --- a/csound.spec +++ b/csound.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -33,7 +33,7 @@ Name: csound Version: 6.12.2 Release: 0 Summary: Computer Sound Synthesis and Composition Program -License: GFDL-1.2-only AND LGPL-2.1-or-later AND MIT +License: GPL-2.0-or-later AND BSD-2-Clause Group: Productivity/Multimedia/Sound/Utilities Url: http://www.csounds.com Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -136,6 +136,8 @@ Development files for Csound, a sound synthesis program. sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme cp %{SOURCE1} . +#These source files are undistributable +rm -f Opcodes/scansyn* %build # Needed to link libbuchla.so @@ -143,6 +145,7 @@ export CFLAGS="%{optflags} -lm" export CXXFLAGS="%{optflags} -std=c++11" %cmake \ + -DBUILD_SCANSYN_OPCODES=OFF \ %if %{with python} -DPYTHON_LIBRARY="%{_libdir}/libpython$(pkg-config python3 --modversion)$(python3-config --abiflags).so" \ -DPYTHON_INCLUDE_DIR="%{_includedir}/python$(pkg-config python3 --modversion)$(python3-config --abiflags)" \ @@ -178,7 +181,7 @@ rm -rf %{buildroot}root %files %doc AUTHORS README.md README.SUSE Release_Notes -%license COPYING +%license COPYING OOps/LICENCE.random %{_bindir}/* %files -n libcsnd6-%{maj}_%{min} @@ -204,12 +207,4 @@ rm -rf %{buildroot}root %files lang -f %{name}%{maj}.lang %defattr(-,root,root) -# TODO: -%if 1 == 0 --- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/_csnd6.so --- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/csnd6.py --- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/ctcsound.py - -%endif - %changelog