rpms/kdelibs/devel kdelibs-3.97.0-flac113.patch, NONE, 1.1 kdelibs.spec, 1.256, 1.257

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29867/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.97.0-flac113.patch 
Log Message:
* Wed Jan 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-10
- apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake

kdelibs-3.97.0-flac113.patch:

--- NEW FILE kdelibs-3.97.0-flac113.patch ---
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 at kde.org>
 # Copyright (c) 2006, Alexander Neundorf, <neundorf at 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)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- kdelibs.spec	22 Dec 2007 19:52:36 -0000	1.256
+++ kdelibs.spec	2 Jan 2008 17:58:47 -0000	1.257
@@ -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 @@
 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 @@
 %patch0 -p1 -b .parallel_devel
 %patch1 -p1 -b .kde149703
 %patch2 -p1 -b .kde149705
+%patch3 -p1 -b .flac113
 
 
 %build
@@ -253,6 +257,9 @@
 
 
 %changelog
+* Wed Jan 02 2007 Kevin Kofler <Kevin at 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 at tigcc.ticalc.org> 3.97.0-9
 - drop BR aspell-devel on F9+, use only enchant (FeatureDictionary)