From 85b8fae8e6e95490589ccfe23ac8ff698bac8711 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Jan 02 2008 17:58:47 +0000
Subject: * Wed Jan 02 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-10

- apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake

---

diff --git a/kdelibs-3.97.0-flac113.patch b/kdelibs-3.97.0-flac113.patch
new file mode 100644
index 0000000..6e48dd6
--- /dev/null
+++ b/kdelibs-3.97.0-flac113.patch
@@ -0,0 +1,36 @@
+Index: kdelibs/cmake/modules/FindFlac.cmake
+===================================================================
+--- kdelibs/cmake/modules/FindFlac.cmake	(revision 749960)
++++ kdelibs/cmake/modules/FindFlac.cmake	(working copy)
+@@ -5,6 +5,9 @@
+ #  FLAC_INCLUDE_DIR - the Flac include directory
+ #  FLAC_LIBRARIES - Link these to use Flac
+ #  FLAC_OGGFLAC_LIBRARIES - Link these to use OggFlac
++#
++# No version checking is done - use FLAC_API_VERSION_CURRENT to
++# conditionally compile version-dependent code
+ 
+ # Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+ # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+@@ -23,18 +26,16 @@ FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC )
+ 
+ FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC)
+ 
+-check_library_exists(FLAC FLAC__stream_encoder_set_write_callback "" HAVE_STREAM_ENCODER_WRITE_CALLBACK)
+-
+ 
+ 
+-IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
++IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+    SET(FLAC_FOUND TRUE)
+    IF (FLAC_OGG_LIBRARY)
+       SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES})
+    ENDIF (FLAC_OGG_LIBRARY)
+-ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
++ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+    SET(FLAC_FOUND FALSE)
+-ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
++ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+ 
+ IF(FLAC_FOUND)
+    IF(NOT Flac_FIND_QUIETLY)
diff --git a/kdelibs.spec b/kdelibs.spec
index 597a0f0..a31229f 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.97.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -48,6 +48,9 @@ Patch0: kdelibs-3.95.0-parallel_devel.patch
 Patch1: kdelibs-3.93.0-kde149703.diff
 # fix kde#149705
 Patch2: kdelibs-3.95.0-kde149705.patch
+# FLAC 1.1.3+ support for FindFlac.cmake (patch by Alex Merry)
+# http://lists.kde.org/?l=kde-multimedia&m=119806833708186&w=2
+Patch3: kdelibs-3.97.0-flac113.patch
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -125,6 +128,7 @@ applications for KDE 4.
 %patch0 -p1 -b .parallel_devel
 %patch1 -p1 -b .kde149703
 %patch2 -p1 -b .kde149705
+%patch3 -p1 -b .flac113
 
 
 %build
@@ -253,6 +257,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 02 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-10
+- apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake
+
 * Sat Dec 22 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-9
 - drop BR aspell-devel on F9+, use only enchant (FeatureDictionary)