diff --git a/SOURCES/kdelibs-fix-findtaglib-cmake.patch b/SOURCES/kdelibs-fix-findtaglib-cmake.patch new file mode 100644 index 0000000..e97b43e --- /dev/null +++ b/SOURCES/kdelibs-fix-findtaglib-cmake.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake +index 5bbb8ee..b93ec3d 100644 +--- a/cmake/modules/FindTaglib.cmake ++++ b/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 not found: 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) + +@@ -43,7 +43,7 @@ if(TAGLIBCONFIG_EXECUTABLE) + 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(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) + + else(TAGLIBCONFIG_EXECUTABLE) diff --git a/SPECS/kdelibs.spec b/SPECS/kdelibs.spec index 3b04ebc..4d4bf98 100644 --- a/SPECS/kdelibs.spec +++ b/SPECS/kdelibs.spec @@ -42,7 +42,7 @@ Summary: KDE Libraries # shipped with kde applications, version... %global apps_version 15.04.1 Version: 4.14.8 -Release: 12%{?dist} +Release: 13%{?dist} Name: kdelibs Epoch: 6 @@ -201,6 +201,9 @@ Patch092: return-application-icons-properly.patch # revert disabling of packagekit Patch093: turn-the-packagekit-support-feature-off-by-default.patch +# fix FindTaglib.cmake +Patch094: kdelibs-fix-findtaglib-cmake.patch + ## security fix # Bug 1452068 - CVE-2017-8422 kdelibs: kauth: service invoking dbus is not properly checked and allows local privilege escalation Patch80: kdelibs-kauth-CVE-2017-8422.patch @@ -445,6 +448,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch091 -p1 -R -b .coding-style-fixes.patch %patch092 -p1 -R -b .return-application-icons-properly %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default +%patch094 -p1 -b .fix-findtaglib-cmake # security fixes %patch80 -p1 -b .kdelibs-kauth-CVE-2017-8422 @@ -804,6 +808,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Tue Feb 18 2020 Jan Grulich - 6:4.14.8-13 +- Fix FindTaglib.cmake file to properly detect version + Resolves: bz#1561281 + * Wed Aug 14 2019 Jan Grulich - 6:4.14.8-12 - Bump build due to z-stream fix Resolves: bz#1740737