Hello community, here is the log from the commit of package tomahawk for openSUSE:Factory checked in at 2016-02-16 09:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomahawk (Old) and /work/SRC/openSUSE:Factory/.tomahawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomahawk" Changes: -------- --- /work/SRC/openSUSE:Factory/tomahawk/tomahawk.changes 2015-04-15 16:25:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomahawk.new/tomahawk.changes 2016-02-16 09:18:35.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 11 22:36:02 UTC 2016 - [email protected] + +- Add fix-taglib-detection.diff. Use VERSION_LESS to compare versions. + +------------------------------------------------------------------- New: ---- fix-taglib-detection.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomahawk.spec ++++++ --- /var/tmp/diff_new_pack.WaRCHM/_old 2016-02-16 09:18:36.000000000 +0100 +++ /var/tmp/diff_new_pack.WaRCHM/_new 2016-02-16 09:18:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomahawk # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominik Schmidt # # All modifications and additions to the file contributed by third parties @@ -33,6 +33,8 @@ Source2: tomahawk.SuSEfirewall2 Source3: Tomahawk.khotkeys Source99: tomahawk-rpmlintrc +# PATCH-FIX-UPSTREAM fix-taglib-detection.diff -- Use VERSION_LESS to compare versions +Patch0: fix-taglib-detection.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://gettomahawk.com @@ -155,6 +157,7 @@ %prep %setup -q -n tomahawk-%{version} +%patch0 -p1 %build cmake . \ ++++++ fix-taglib-detection.diff ++++++ diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake index e0efbef..01aa947 100644 --- a/CMakeModules/FindTaglib.cmake +++ b/CMakeModules/FindTaglib.cmake @@ -34,10 +34,10 @@ ELSE() 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 not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") set(TAGLIB_FOUND FALSE) - else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + else() exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) @@ -48,7 +48,7 @@ ELSE() # message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") - endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + endif() mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) else(TAGLIBCONFIG_EXECUTABLE)
