From ba477c9e5fe7ee1a7f5c76d53b300369d94b70b0e08cade01a078164efff9b36 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Sun, 13 Jun 2021 09:10:55 +0000
Subject: [PATCH] Accepting request 898912 from home:kill_it:JUCE

- Update to version 6.15.0
- add -samples subpackage

OBS-URL: https://build.opensuse.org/request/show/898912
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=46
---
 _service                         | 22 ----------------------
 _servicedata                     |  4 ----
 csound-6.14.0+git20200601.tar.xz |  3 ---
 csound-6.15.0.tar.gz             |  3 +++
 csound.changes                   |  6 ++++++
 csound.spec                      | 22 ++++++++++++++++------
 6 files changed, 25 insertions(+), 35 deletions(-)
 delete mode 100644 _service
 delete mode 100644 _servicedata
 delete mode 100644 csound-6.14.0+git20200601.tar.xz
 create mode 100644 csound-6.15.0.tar.gz

diff --git a/_service b/_service
deleted file mode 100644
index a861369..0000000
--- a/_service
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Downloads csound git git master -->
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/csound/csound.git</param>
-    <param name="scm">git</param>
-    <param name="submodules">disable</param>
-    <param name="package-meta">no</param>
-    <param name="changesgenerate">enable</param>
-    <param name="exclude">.git</param>
-    <param name="exclude">Opcodes/scansyn*</param>
-    <param name="exclude">Android</param>
-    <param name="exclude">util/new_srconv.c</param>
-    <param name="versionformat">6.14.0+git%cd</param>
-    <param name="filename">csound</param>
-    <param name="revision">0dad8304c78efba48b4f405f4757f3e0a7e339c0</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-</services>
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 19561c6..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/csound/csound.git</param>
-              <param name="changesrevision">0dad8304c78efba48b4f405f4757f3e0a7e339c0</param></service></servicedata>
\ No newline at end of file
diff --git a/csound-6.14.0+git20200601.tar.xz b/csound-6.14.0+git20200601.tar.xz
deleted file mode 100644
index e878e8c..0000000
--- a/csound-6.14.0+git20200601.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4224e01c7a46a25fbe7eedf19d1385e94768b64b9d780572fd7303d07ec48f50
-size 22245236
diff --git a/csound-6.15.0.tar.gz b/csound-6.15.0.tar.gz
new file mode 100644
index 0000000..d45c0cd
--- /dev/null
+++ b/csound-6.15.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d47ed0fb70c752cb06ee2655ee9f010d8d1e369fc73d09d2ac2bc1b3060bf724
+size 31879171
diff --git a/csound.changes b/csound.changes
index 1e97f64..211210e 100644
--- a/csound.changes
+++ b/csound.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 26 23:30:30 UTC 2021 - Konstantin Voinov <kv@kott.no-ip.biz>
+
+- Update to version 6.15.0
+- add -samples subpackage 
+
 -------------------------------------------------------------------
 Sat Feb 20 07:59:29 UTC 2021 - Dave Plater <davejplater@gmail.com>
 
diff --git a/csound.spec b/csound.spec
index 3d4fda7..cc959f2 100644
--- a/csound.spec
+++ b/csound.spec
@@ -16,8 +16,6 @@
 #
 
 
-%define rev 0dad8304c78efba48b4f405f4757f3e0a7e339c0
-
 %define py3version %(pkg-config python3 --modversion)
 %define support_fltk 1
 %bcond_with python
@@ -32,14 +30,14 @@
 %define min 0
 
 Name:           csound
-Version:        6.14.0+git20200601
+Version:        6.15.0
 Release:        0
 Summary:        Computer Sound Synthesis and Composition Program
-License:        LGPL-2.1-or-later AND GPL-2.0-or-later
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Multimedia/Sound/Utilities
 URL:            http://www.csounds.com
-#Source:         https://github.com/%%{name}/%%{name}/archive/%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.xz
+Source:         https://github.com/csound/csound/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+#Source0:        %{name}-%{version}.tar.xz
 Source1:        README.SUSE
 Source2:        COPYING_gpl2+.txt
 # Default to using pulseaudio instead of portaudio
@@ -83,6 +81,7 @@ Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/')
+
 %description
 Csound is a software synthesis program. It is modular and
 supports an unlimited amount of oscillators and filters.
@@ -121,6 +120,14 @@ Group:          Productivity/Multimedia/Other
 %description plugins
 Plugins for csound
 
+%package samples
+Summary:        Data files for csound
+License:        MIT
+Group:          Productivity/Multimedia/Other
+
+%description samples
+HRTF datafiles and Soundfont for csound
+
 %package devel
 Summary:        Development files for Csound
 Group:          Development/Libraries/C and C++
@@ -205,6 +212,9 @@ cp -v OOps/README.md README.OOps
 %files plugins
 %{_libdir}/csound/
 
+%files samples
+%{_datadir}/samples/
+
 %files devel
 %{_includedir}/csound/
 %{_libdir}/libcs*.so