Hello community, here is the log from the commit of package minuet for openSUSE:Factory checked in at 2018-03-22 12:01:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minuet (Old) and /work/SRC/openSUSE:Factory/.minuet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minuet" Thu Mar 22 12:01:06 2018 rev:19 rq:585660 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/minuet/minuet.changes 2018-02-14 09:43:33.149460891 +0100 +++ /work/SRC/openSUSE:Factory/.minuet.new/minuet.changes 2018-03-22 12:06:51.749920259 +0100 @@ -1,0 +2,18 @@ +Fri Mar 9 13:32:04 UTC 2018 - [email protected] + +- Add 0001-Also-detect-fluidsynth-1.1.xx.patch +Fixes build with fluidsynth > 1.1.XX + +------------------------------------------------------------------- +Thu Mar 08 23:52:26 CET 2018 - [email protected] + +- 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. + +------------------------------------------------------------------- Old: ---- minuet-17.12.2.tar.xz New: ---- 0001-Also-detect-fluidsynth-1.1.xx.patch minuet-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minuet.spec ++++++ --- /var/tmp/diff_new_pack.IeuSL1/_old 2018-03-22 12:06:53.953841254 +0100 +++ /var/tmp/diff_new_pack.IeuSL1/_new 2018-03-22 12:06:53.957841110 +0100 @@ -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 @@ %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Application for Music Education. @@ -79,6 +79,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build @@ -88,7 +89,7 @@ %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 @@ %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 @@ %{_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 ++++++ 0001-Also-detect-fluidsynth-1.1.xx.patch ++++++ >From a84c183bb25201c46fa64316be619b10fdec674f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> 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 ++++++ minuet-17.12.2.tar.xz -> minuet-17.12.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/minuet/minuet-17.12.2.tar.xz /work/SRC/openSUSE:Factory/.minuet.new/minuet-17.12.3.tar.xz differ: char 27, line 1
