From fdc35c07740287cb1f029061988fed92d8aa1e77a4e179c4bb7ca77ad831a3a7 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 10 Apr 2018 13:21:10 +0000
Subject: [PATCH] KDE Applications 18.04 RC (take 3): for the changes proposed
 by Wolfgang, I think they can get in after this is accepted.

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/minuet?expand=0&rev=74
---
 0001-Also-detect-fluidsynth-1.1.xx.patch | 33 ------------------------
 minuet-17.12.3.tar.xz                    |  3 ---
 minuet-18.03.90.tar.xz                   |  3 +++
 minuet.changes                           | 12 +++++++++
 minuet.spec                              |  5 +---
 5 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 0001-Also-detect-fluidsynth-1.1.xx.patch
 delete mode 100644 minuet-17.12.3.tar.xz
 create mode 100644 minuet-18.03.90.tar.xz

diff --git a/0001-Also-detect-fluidsynth-1.1.xx.patch b/0001-Also-detect-fluidsynth-1.1.xx.patch
deleted file mode 100644
index d37ff95..0000000
--- a/0001-Also-detect-fluidsynth-1.1.xx.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a84c183bb25201c46fa64316be619b10fdec674f Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Fri, 9 Mar 2018 14:23:30 +0100
-Subject: [PATCH] Also detect fluidsynth 1.1.xx
-
----
- cmake/FindFluidSynth.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/FindFluidSynth.cmake b/cmake/FindFluidSynth.cmake
-index 27135a3..d0f3e86 100644
---- a/cmake/FindFluidSynth.cmake
-+++ b/cmake/FindFluidSynth.cmake
-@@ -73,13 +73,13 @@ find_path(FluidSynth_INCLUDE_DIRS
-   HINTS ${PC_FluidSynth_INCLUDEDIR}
- )
- 
--#set(FluidSynth_VERSION "${PC_FluidSynth_VERSION}")
-+set(FluidSynth_VERSION "${PC_FluidSynth_VERSION}")
- 
- if(NOT FluidSynth_VERSION)
-   if(EXISTS "${FluidSynth_INCLUDE_DIRS}/fluidsynth/version.h")
-     file(STRINGS "${FluidSynth_INCLUDE_DIRS}/fluidsynth/version.h" _FLUIDSYNTH_VERSION_H
--         REGEX "^#define[ ]+FLUIDSYNTH_VERSION[ ]+\"[0-9].[0-9].[0-9]\"")
--    string(REGEX REPLACE "^#define[ ]+FLUIDSYNTH_VERSION[ ]+\"([0-9].[0-9].[0-9])\".*" "\\1" FluidSynth_VERSION "${_FLUIDSYNTH_VERSION_H}")
-+         REGEX "^#define[ ]+FLUIDSYNTH_VERSION.*$")
-+    string(REGEX REPLACE "^#define[ ]+FLUIDSYNTH_VERSION[ ]+\"([0-9]+.[0-9]+.[0-9]+)\".*" "\\1" FluidSynth_VERSION "${_FLUIDSYNTH_VERSION_H}")
-     unset(_FLUIDSYNTH_VERSION_H)
-   endif()
- endif()
--- 
-2.16.2
-
diff --git a/minuet-17.12.3.tar.xz b/minuet-17.12.3.tar.xz
deleted file mode 100644
index db8ca54..0000000
--- a/minuet-17.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bf1f32fedb3345a7bf3fba715fc670edf442c53cc150a30f43311bde66519aa
-size 27860148
diff --git a/minuet-18.03.90.tar.xz b/minuet-18.03.90.tar.xz
new file mode 100644
index 0000000..035a5b7
--- /dev/null
+++ b/minuet-18.03.90.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fbbdd495d17ec3fce9183789001c760861d8ce45b94076be20ecbec020c8bfe
+size 27855056
diff --git a/minuet.changes b/minuet.changes
index 11ade07..fc42c4b 100644
--- a/minuet.changes
+++ b/minuet.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Apr 06 07:10:15 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.03.90
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.03.90.php
+- Changes since 17.12.3:
+  * Also detect fluidsynth 1.1.xx
+- Dropped patches, now upstream:
+  * 0001-Also-detect-fluidsynth-1.1.xx.patch
+
 -------------------------------------------------------------------
 Fri Mar  9 13:32:04 UTC 2018 - christophe@krop.fr
 
diff --git a/minuet.spec b/minuet.spec
index a86df43..de28b2c 100644
--- a/minuet.spec
+++ b/minuet.spec
@@ -21,15 +21,13 @@
 %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           minuet
-Version:        17.12.3
+Version:        18.03.90
 Release:        0
 Summary:        A KDE Software for Music Education
 License:        GPL-2.0-or-later
 Group:          Productivity/Other
 Url:            http://www.kde.org
 Source:         minuet-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM 0001-Also-detect-fluidsynth-1.1.xx.patch
-Patch0:         0001-Also-detect-fluidsynth-1.1.xx.patch
 BuildRequires:  extra-cmake-modules >= 5.15.0
 BuildRequires:  kf5-filesystem
 BuildRequires:  pkgconfig
@@ -79,7 +77,6 @@ Development headers and libraries for Minuet.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
   %cmake_kf5 -d build