From e43943faab3787990ab0c898d8cce63064f416815978bbbf3b0b7d3d10028541 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 10 Mar 2018 12:11:42 +0000 Subject: [PATCH] KDE Applications 17.12.3 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/minuet?expand=0&rev=72 --- 0001-Also-detect-fluidsynth-1.1.xx.patch | 33 ++++++++++++++++++++++++ minuet-17.12.2.tar.xz | 3 --- minuet-17.12.3.tar.xz | 3 +++ minuet.changes | 18 +++++++++++++ minuet.spec | 23 +++++++++-------- 5 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 0001-Also-detect-fluidsynth-1.1.xx.patch delete mode 100644 minuet-17.12.2.tar.xz create mode 100644 minuet-17.12.3.tar.xz diff --git a/0001-Also-detect-fluidsynth-1.1.xx.patch b/0001-Also-detect-fluidsynth-1.1.xx.patch new file mode 100644 index 0000000..d37ff95 --- /dev/null +++ b/0001-Also-detect-fluidsynth-1.1.xx.patch @@ -0,0 +1,33 @@ +From a84c183bb25201c46fa64316be619b10fdec674f Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +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.2.tar.xz b/minuet-17.12.2.tar.xz deleted file mode 100644 index 25cf1a5..0000000 --- a/minuet-17.12.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:796c349ad7bca1b0a6fd68731a8ea71facfd006c8a43b9fa764789b600b4fc9d -size 27848724 diff --git a/minuet-17.12.3.tar.xz b/minuet-17.12.3.tar.xz new file mode 100644 index 0000000..db8ca54 --- /dev/null +++ b/minuet-17.12.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bf1f32fedb3345a7bf3fba715fc670edf442c53cc150a30f43311bde66519aa +size 27860148 diff --git a/minuet.changes b/minuet.changes index 7a75322..11ade07 100644 --- a/minuet.changes +++ b/minuet.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Mar 9 13:32:04 UTC 2018 - christophe@krop.fr + +- Add 0001-Also-detect-fluidsynth-1.1.xx.patch +Fixes build with fluidsynth > 1.1.XX + +------------------------------------------------------------------- +Thu Mar 08 23:52:26 CET 2018 - lbeltrame@kde.org + +- Update to 17.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.3.php +- Changes since 17.12.2: + * Fix Build when fluidsynth isn't found. + * Create FindFluidSynth.cmake. + * Fix build with fluidsynth 1.1.9. + ------------------------------------------------------------------- Wed Feb 07 08:49:09 CET 2018 - lbeltrame@kde.org diff --git a/minuet.spec b/minuet.spec index 5a6efdf..a86df43 100644 --- a/minuet.spec +++ b/minuet.spec @@ -16,19 +16,20 @@ # -%bcond_without lang - %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang Name: minuet -Version: 17.12.2 +Version: 17.12.3 Release: 0 Summary: A KDE Software for Music Education -License: GPL-2.0+ +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 @@ -52,7 +53,6 @@ Requires: libqt5-qtquickcontrols2 %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Application for Music Education. @@ -79,6 +79,7 @@ Development headers and libraries for Minuet. %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build @@ -88,7 +89,7 @@ Development headers and libraries for Minuet. %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif %suse_update_desktop_file org.kde.minuet Music @@ -96,8 +97,8 @@ Development headers and libraries for Minuet. %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING* README* +%doc README* +%license COPYING* %dir %{_kf5_appstreamdir} %doc %lang(en) %{_kf5_htmldir}/en/minuet/ %{_kf5_applicationsdir}/org.kde.minuet.desktop @@ -109,14 +110,14 @@ Development headers and libraries for Minuet. %{_kf5_sharedir}/minuet/ %files devel -%defattr(-,root,root) -%doc COPYING* README* +%doc README* +%license COPYING* %{_includedir}/minuet/ %{_kf5_libdir}/libminuetinterfaces.so %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog