[kscd] 4.13.1

[Rex Dieter]

commit aabf3f06596d2c5d7ab0dcee9b0a513614fbd557
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun May 11 07:47:04 2014 -0500

    4.13.1

 .gitignore                                   |   23 +---
 0001-Swap-names-of-loop-random-buttons.patch |  249 --------------------------
 kscd-review110852.patch                      |   60 ++++++
 kscd.spec                                    |   15 +-
 sources                                      |    2 +-
 5 files changed, 72 insertions(+), 277 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d946e8e..f206f14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1 @@
-/kscd-4.10.1.tar.xz
-/kscd-4.10.2.tar.xz
-/kscd-4.10.3.tar.xz
-/kscd-4.10.4.tar.xz
-/kscd-4.10.90.tar.xz
-/kscd-4.10.95.tar.xz
-/kscd-4.10.97.tar.xz
-/kscd-4.11.0.tar.xz
-/kscd-4.11.1.tar.xz
-/kscd-4.11.2.tar.xz
-/kscd-4.11.3.tar.xz
-/kscd-4.11.90.tar.xz
-/kscd-4.11.95.tar.xz
-/kscd-4.11.97.tar.xz
-/kscd-4.12.0.tar.xz
-/kscd-4.12.1.tar.xz
-/kscd-4.12.2.tar.xz
-/kscd-4.12.3.tar.xz
-/kscd-4.12.90.tar.xz
-/kscd-4.12.95.tar.xz
-/kscd-4.12.97.tar.xz
-/kscd-4.13.0.tar.xz
+/kscd-4.13.1.tar.xz
diff --git a/kscd-review110852.patch b/kscd-review110852.patch
new file mode 100644
index 0000000..82178a6
--- /dev/null
+++ b/kscd-review110852.patch
@@ -0,0 +1,60 @@
+From 3148ed4ac209c366c6a03d7da5e13ea3a02de595 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Thu, 6 Jun 2013 12:43:59 -0500
+Subject: [PATCH] Improve MusicBrainz3 buildsys support
+
+BUG: 320808
+- include directory is not used
+- add pkgconfig hints
+---
+ CMakeLists.txt               |  3 ++-
+ cmake/FindMusicBrainz3.cmake | 19 ++++++++++++++++---
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a2a8e5..e891506 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,8 @@ find_package(MusicBrainz3 REQUIRED)
+ include_directories(
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gui
+ 		${CMAKE_CURRENT_SOURCE_DIR}
+-			${CMAKE_CURRENT_BINARY_DIR}
++		${CMAKE_CURRENT_BINARY_DIR}
++		${MUSICBRAINZ3_INCLUDE_DIR}
+ 		)
+ add_subdirectory(tests)
+ ########### next target ###############
+diff --git a/cmake/FindMusicBrainz3.cmake b/cmake/FindMusicBrainz3.cmake
+index e4bb814..2d11e36 100644
+--- a/cmake/FindMusicBrainz3.cmake
++++ b/cmake/FindMusicBrainz3.cmake
+@@ -14,9 +14,22 @@ if(MUSICBRAINZ3_INCLUDE_DIR AND MUSICBRAINZ3_LIBRARIES)
+    set(MUSICBRAINZ3_FIND_QUIETLY TRUE)
+ endif(MUSICBRAINZ3_INCLUDE_DIR AND MUSICBRAINZ3_LIBRARIES)
+ 
+-FIND_PATH(MUSICBRAINZ3_INCLUDE_DIR musicbrainz3/musicbrainz.h)
+-
+-FIND_LIBRARY( MUSICBRAINZ3_LIBRARIES NAMES musicbrainz3)
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_LIBRARY() calls
++find_package(PkgConfig)
++pkg_check_modules(PC_LIBMUSICBRAINZ3 QUIET libmusicbrainz3)
++
++FIND_PATH(MUSICBRAINZ3_INCLUDE_DIR musicbrainz3/musicbrainz.h
++          HINTS
++          ${PC_LIBMUSICBRAINZ3_INCLUDEDIR}
++          ${PC_LIBMUSICBRAINZ3_INCLUDE_DIRS}
++)
++
++FIND_LIBRARY( MUSICBRAINZ3_LIBRARIES NAMES musicbrainz3
++              HINTS
++              ${PC_LIBMUSICBRAINZ3_LIBDIR}
++              ${PC_LIBMUSICBRAINZ3_LIB_DIRS}
++)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args( MusicBrainz3 DEFAULT_MSG
+-- 
+1.8.2.1
+
diff --git a/kscd.spec b/kscd.spec
index 3d4cb24..c4ba8c8 100644
--- a/kscd.spec
+++ b/kscd.spec
@@ -1,7 +1,7 @@
 Name:    kscd 
 Summary: CD Player 
-Version: 4.13.0
-Release: 2%{?dist}
+Version: 4.13.1
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:      http://www.kde.org/applications/multimedia/kscd/
@@ -14,9 +14,11 @@ URL:      http://www.kde.org/applications/multimedia/kscd/
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable patches
+# https://git.reviewboard.kde.org/r/110852/
+Patch50: kscd-review110852.patch
+
 ## upstream patches
-# http://quickgit.kde.org/?p=kscd.git&a=commit&h=357eb85684552c237803ffa9db037b3918a7a220
-Patch101: 0001-Swap-names-of-loop-random-buttons.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
@@ -36,7 +38,7 @@ KsCD is a small, fast, CDDB enabled audio CD player.
 %prep
 %setup -q
 
-%patch101 -p1 -b .0001
+%patch50 -p1 -b .review110852
 
 
 %build
@@ -81,6 +83,9 @@ fi
 
 
 %changelog
+* Sun May 11 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-1
+- 4.13.1
+
 * Fri Apr 18 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.0-2
 - upstream fix for swapped Loop and Random buttons (kde #234332)
 
diff --git a/sources b/sources
index 2780381..c1ed027 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b09bcb4a769c22722002bedbb626234  kscd-4.13.0.tar.xz
+33f6f708868f4396eb6f148a325042ce  kscd-4.13.1.tar.xz