[packages/tellico] - updated to 2.3.8 - fixed build with split kdemultimedia

[baggins]

commit 3d5dde55ae46a53bad91e2d26f12d6eacc819f77
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 8 19:34:46 2013 +0100

    - updated to 2.3.8
    - fixed build with split kdemultimedia

 libkcddb.patch | 37 +++++++++++++++++++++++++++++++++++++
 tellico.spec   | 11 ++++++++---
 2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/tellico.spec b/tellico.spec
index fdba811..0457429 100644
--- a/tellico.spec
+++ b/tellico.spec
@@ -5,23 +5,26 @@
 Summary:	A collection manager
 Summary(pl.UTF-8):	Zarządca zbiorów wideo, audio i książek
 Name:		tellico
-Version:	2.3.5
+Version:	2.3.8
 Release:	1
 License:	GPL v3
 Group:		X11/Applications
 Source0:	http://tellico-project.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	e6a1835d2622b79c4bfd95271bce858e
+# Source0-md5:	3f85002f6f369bdcf72ac7499d39297a
 Patch1:		%{name}-desktop.patch
+Patch2:		libkcddb.patch
 URL:		http://tellico-project.org/
 BuildRequires:	cmake
 BuildRequires:	exempi-devel
-BuildRequires:	kde4-kdemultimedia-devel
 BuildRequires:	kde4-kdepimlibs-devel
+BuildRequires:	kde4-libksane-devel
+BuildRequires:	kde4-libkcddb-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-devel >= 1.0.19
 BuildRequires:	poppler-Qt-devel
 BuildRequires:	qimageblitz-devel
+BuildRequires:	qjson-devel
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	shared-desktop-ontologies-devel
 BuildRequires:	soprano-devel
@@ -43,9 +46,11 @@ księgozbiorów, archiwów wideo i audio.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+exit
 %{__make}
 
 %install
diff --git a/libkcddb.patch b/libkcddb.patch
new file mode 100644
index 0000000..9469859
--- /dev/null
+++ b/libkcddb.patch
@@ -0,0 +1,37 @@
+--- tellico-2.3.8/CMakeLists.txt~	2013-07-08 05:42:53.000000000 +0200
++++ tellico-2.3.8/CMakeLists.txt	2013-11-08 19:07:20.205665333 +0100
+@@ -55,8 +55,8 @@
+     include_directories(${KDEPIMLIBS_INCLUDE_DIRS})
+ endif(KDEPIMLIBS_FOUND)
+ 
+-macro_optional_find_package(KdeMultimedia)
+-macro_log_feature(KDEMULTIMEDIA_FOUND "kdemultimedia" "Support for CDDB searches" "http://multimedia.kde.org" FALSE "4.2.0" "")
++macro_optional_find_package(Libkcddb)
++macro_log_feature(LIBKCDDB_LIBRARIES "libkcddb" "Support for CDDB searches" "http://multimedia.kde.org" FALSE "4.2.0" "")
+ 
+ # The taglib cmake script is broken for older taglib versions, this works around the issue
+ set(TAGLIB_INCLUDES)
+@@ -169,7 +169,7 @@
+ macro_bool_to_01(LIBEXEMPI_FOUND HAVE_EXEMPI)
+ macro_bool_to_01(YAZ_FOUND HAVE_YAZ)
+ macro_bool_to_01(KSANE_FOUND HAVE_KSANE)
+-macro_bool_to_01(KDEMULTIMEDIA_FOUND HAVE_KCDDB)
++macro_bool_to_01(LIBKCDDB_LIBRARIES HAVE_KCDDB)
+ macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KABC)
+ macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KCAL)
+ macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KXMLRPC)
+--- tellico-2.3.8/src/CMakeLists.txt~	2013-07-08 05:38:42.000000000 +0200
++++ tellico-2.3.8/src/CMakeLists.txt	2013-11-08 19:31:46.275654720 +0100
+@@ -107,9 +107,9 @@
+   TARGET_LINK_LIBRARIES(tellico ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCAL_LIBS})
+ ENDIF( KDEPIMLIBS_FOUND )
+ 
+-IF( KDEMULTIMEDIA_FOUND )
+-  TARGET_LINK_LIBRARIES(tellico ${KCDDB_LIBRARY})
+-ENDIF( KDEMULTIMEDIA_FOUND)
++IF( LIBKCDDB_LIBRARIES )
++  TARGET_LINK_LIBRARIES(tellico ${LIBKCDDB_LIBRARIES})
++ENDIF( LIBKCDDB_LIBRARIES )
+ 
+ IF( POPPLER_QT4_FOUND )
+   TARGET_LINK_LIBRARIES(tellico ${POPPLER_QT4_LIBRARIES})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tellico.git/commitdiff/3d5dde55ae46a53bad91e2d26f12d6eacc819f77