[rpms/amarok] epel10: backport upstream FindTaglib.cmake fix

[rpms/amarok] epel10: backport upstream FindTaglib.cmake fix

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 30b0a20070b417d2e0e8963d01dffce3eeb2a3e5
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2015-08-28T09:21:09-05:00
Stats  : +49/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/30b0a20070b417d2e0e8963d01dffce3eeb2a3e5?branch=epel10

Log:
backport upstream FindTaglib.cmake fix

---
diff --git a/0473-Fix-TagLib-version-check.patch b/0473-Fix-TagLib-version-check.patch
new file mode 100644
index 0000000..8751870
--- /dev/null
+++ b/0473-Fix-TagLib-version-check.patch
@@ -0,0 +1,43 @@
+From fec8817c530ce42b6485fdabff6051784b8d9904 Mon Sep 17 00:00:00 2001
+From: Omar Plummer <omarplummer@imergetechnologies.com>
+Date: Fri, 7 Aug 2015 00:24:27 +0200
+Subject: [PATCH 473/474] Fix TagLib version check.
+
+The version check compared version strings lexicographically, so "1.7"
+(the min version) compared as greater than "1.10.0".
+
+BUG: 351013
+REVIEW: 124639
+---
+ cmake/modules/FindTaglib.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..f485a42 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_MIN_VERSION}" VERSION_GREATER TAGLIB_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_MIN_VERSION}" VERSION_GREATER TAGLIB_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_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)
+-- 
+2.4.3
+

diff --git a/amarok.spec b/amarok.spec
index 951c95e..45d20ca 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -8,7 +8,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.8.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -39,6 +39,7 @@ Patch0039: 0039-Optimization-Don-t-draw-more-than-necessary.patch
 Patch0055: 0055-Enable-Wikipedia-over-SSL.patch
 Patch0070: 0070-Rewrite-Block-Analyzer-to-use-pure-OpenGL-instead-of.patch
 Patch0071: 0071-Fix-rendering-glitch-introduced-with-commit-f4a3f4f.patch
+Patch0473: 0473-Fix-TagLib-version-check.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -153,6 +154,7 @@ Requires: %{name} = %{version}-%{release}
 %patch0055 -p1 -b .0055
 %patch0070 -p1 -b .0070
 %patch0071 -p1 -b .0071
+%patch0473 -p1 -b .0473
 
 
 %build
@@ -291,6 +293,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2015 Rex Dieter <rdieter@fedoraproject.org> 2.8.0-19
+- backport upstream FindTaglib.cmake fix
+
 * Mon Jun 29 2015 Rex Dieter <rdieter@fedoraproject.org> 2.8.0-18
 - Amarok has an unmet dependency on rhel7: audiocd-kio (#1232818)