pull in upstream fixes

0002-FindTaglib.cmake-fix-version-detection-for-1.10.patch

@@ -1,8 +1,11 @@
-commit 967fc70300d5c2ae34d39b61757b717f6fca8805
-Author: Rex Dieter <rdieter@math.unl.edu>
-Date:   Sat Nov 7 06:54:26 2015 -0600
+From 967fc70300d5c2ae34d39b61757b717f6fca8805 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Sat, 7 Nov 2015 06:54:26 -0600
+Subject: [PATCH 2/5] FindTaglib.cmake: fix version detection for 1.10
 
-    FindTaglib.cmake: fix version detection for 1.10
+---
+ 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 5bbb8ee..4319d6b 100644
@@ -30,3 +33,6 @@ index 5bbb8ee..4319d6b 100644
    mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
  
  else(TAGLIBCONFIG_EXECUTABLE)
+-- 
+1.9.3
+

0003-Give-each-htmlhandbook-target-a-unique-name.patch

@@ -0,0 +1,40 @@
+From eaf92b8d2f5a058fbf575d733f0924c446eb93ee Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sat, 7 Nov 2015 11:40:00 +0100
+Subject: [PATCH 3/5] Give each htmlhandbook target a unique name
+
+Since the CMP0002 warnings have been turned into errors it was
+impossible to build kdelibs with -DKDE4_ENABLE_HTMLHANDBOOK:BOOL=TRUE:
+
+"CMake Error at cmake/modules/KDE4Macros.cmake:315 (add_custom_target):
+add_custom_target cannot create target "htmlhandbook" because another
+target with the same name already exists...."
+
+The bug below is more about the similar error with -DKDE4_BUILD_TESTS
+but since it's still open (and I commented there about the htmlhandbook
+error ;-) I included it here.
+
+BUG: 351287
+REVIEW: 125983
+---
+ cmake/modules/KDE4Macros.cmake | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
+index 5b3db07..d540da7 100644
+--- a/cmake/modules/KDE4Macros.cmake
++++ b/cmake/modules/KDE4Macros.cmake
+@@ -317,7 +317,9 @@ macro (KDE4_CREATE_HANDBOOK _docbook)
+          DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet}
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+       )
+-      add_custom_target(htmlhandbook DEPENDS ${_htmlDoc})
++      _suggest_target_name(_targ)
++      set(_targ "${_targ}-htmlhandbook")
++      add_custom_target(${_targ} ALL DEPENDS ${_htmlDoc})
+    endif(KDE4_ENABLE_HTMLHANDBOOK)
+ 
+    set(_args ${ARGN})
+-- 
+1.9.3
+

kdelibs.spec

@@ -52,7 +52,7 @@ Summary: KDE Libraries
 # shipped with kde applications, version...
 %global apps_version 15.08.3
 Version: 4.14.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -189,7 +189,8 @@ Patch64: kdelibs-4.13.2-invokeTerminal.patch
 
 ## upstream
 # 4.14 branch
-Patch100: FindTagLib.cmake_fix_version_detection.patch
+Patch102: 0002-FindTaglib.cmake-fix-version-detection-for-1.10.patch
+Patch103: 0003-Give-each-htmlhandbook-target-a-unique-name.patch
 
 # revert these commits for
 #https://bugs.kde.org/315578
@@ -464,7 +465,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch64 -p1 -b .invokeTerminal
 
 # upstream patches
-%patch100 -p1 -b .taglib_version
+%patch102 -p1 -b .0002
+%patch103 -p1 -b .0003
 %if 0%{?fedora} < 22
 %patch090 -p1 -R -b .return-not-break.-copy-paste-error
 %patch091 -p1 -R -b .coding-style-fixes.patch
@@ -832,6 +834,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Nov 25 2015 Rex Dieter <rdieter@fedoraproject.org> 6:4.14.14-2
+- pull in upstream fixes
+
 * Sat Nov 07 2015 Rex Dieter <rdieter@fedoraproject.org> 6:4.14.14-1
 - 4.14.14 (kde apps 15.08.3)