Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2016-01-09 23:11:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2015-12-20 10:51:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2016-01-09 23:11:50.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 5 07:29:12 UTC 2016 - [email protected] + +- Add amarok-taglib-compare.patch (kde#351013) + +------------------------------------------------------------------- New: ---- amarok-taglib-compare.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.nrBG7I/_old 2016-01-09 23:11:52.000000000 +0100 +++ /var/tmp/diff_new_pack.nrBG7I/_new 2016-01-09 23:11:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package amarok # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,7 @@ Patch2: flac_mimetype_bnc671581.diff # PATCH-FIX-UPSTREAM revert_solid_workaround.diff Patch3: revert_solid_workaround.diff +Patch4: amarok-taglib-compare.patch # PATCH-FIX-UPSTREAM 0001-Don-t-add-the-analyzer-applet-when-Phonon-doesn-t-su.patch -- avoids adding the analyzer applet on phonon backends that don't support it (e.g. vlc) Patch100: 0001-Don-t-add-the-analyzer-applet-when-Phonon-doesn-t-su.patch # PATCH-FIX-UPSTREAM 0002-Don-t-allow-adding-Analyzer-applet-when-not-supporte.patch -- Don't allow adding Analyzer applet when not supported. @@ -110,6 +111,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 ++++++ amarok-taglib-compare.patch ++++++ Starting with taglib 1.10 we have to use VERSION_LESS, rather than STRLESS. Otherwise we get this error message: - TagLib version too old: version searched :1.7, found 1.10 --- cmake/modules/FindTaglib.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: amarok-2.8.0/cmake/modules/FindTaglib.cmake =================================================================== --- amarok-2.8.0.orig/cmake/modules/FindTaglib.cmake +++ amarok-2.8.0/cmake/modules/FindTaglib.cmake @@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE) exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) - if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") set(TAGLIB_FOUND FALSE) - else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) @@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE) set(TAGLIB_FOUND TRUE) endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") - endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) else(TAGLIBCONFIG_EXECUTABLE)
