X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=digikam.spec;h=571aaf23caed789e0f41878be4870aead7a78df2;hb=51dfe2aa969fa8f7bed478706f24e20de2a6d7f3;hp=12690d149ca20ae301f9c181c1530a276e6d6bb4;hpb=58b6ff85a1d60bce4be352a882d3b3291aa0092f;p=packages%2Fdigikam.git

diff --git a/digikam.spec b/digikam.spec
index 12690d1..571aaf2 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,13 +5,15 @@
 Summary:	A KDE frontend for gphoto2
 Summary(pl.UTF-8):	Interfejs KDE do gphoto2
 Name:		digikam
-Version:	4.0.0
-Release:	2
+Version:	4.13.0
+Release:	4
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://download.kde.org/stable/digikam/%{name}-%{version}.tar.bz2
-# Source0-md5:	03438cc1aeb9a266dcf1f2523ffe983d
+# Source0-md5:	930b9a89244afd1f28490d0acabbecc5
 Patch0:		%{name}-build.patch
+Patch1:		sendimages-icedove.diff
+Patch2:		opencv3.patch
 URL:		http://www.digikam.org/
 BuildRequires:	ImageMagick-devel
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -24,9 +26,10 @@ BuildRequires:	automoc4
 BuildRequires:	clapack-devel
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	eigen3
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	jasper-devel
 BuildRequires:	java-opencv
+BuildRequires:	kde4-baloo-devel >= %{kdever}
 BuildRequires:	kde4-kdelibs-devel >= %{kdever}
 BuildRequires:	kde4-kdepimlibs-devel >= %{kdever}
 BuildRequires:	lcms-devel
@@ -82,9 +85,11 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 # use kde one
-mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
+rm cmake/modules/FindK{Sane,exiv2,ipi}.cmake
 
 %build
 install -d build
@@ -92,7 +97,11 @@ cd build
 %cmake \
 	-DSERVERCMD_MYSQL=%{_sbindir}/mysqld \
 	-DENABLE_RAWSPEED=ON \
-	-DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \
+	-DDIGIKAMSC_COMPILE_LIBKFACE:BOOL=ON \
+	-DDIGIKAMSC_COMPILE_LIBKGEOMAP:BOOL=ON \
+	-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI:BOOL=ON \
+	-DDIGIKAMSC_COMPILE_LIBKVKONTAKTE:BOOL=ON \
+	-DENABLE_OPENCV3:BOOL=ON \
 	../
 
 %{__make}
@@ -122,8 +131,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/cleanup_digikamdb
 %attr(755,root,root) %{_bindir}/digikam
 %attr(755,root,root) %{_bindir}/dngconverter
-%attr(755,root,root) %{_bindir}/dnginfo
 %attr(755,root,root) %{_bindir}/expoblending
+%attr(755,root,root) %{_bindir}/libkgeomap_demo
 %attr(755,root,root) %{_bindir}/panoramagui
 %attr(755,root,root) %{_bindir}/photolayoutseditor
 %attr(755,root,root) %{_bindir}/scangui
@@ -135,15 +144,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/kconf_update/adjustlevelstool.upd
 %attr(755,root,root) %{_bindir}/digitaglinktree
 %attr(755,root,root) %{_bindir}/showfoto
-#%attr(755,root,root) %ghost %{_libdir}/libdigikamdatabase.so.4
 %attr(755,root,root) %{_libdir}/libdigikamdatabase.so.*.*.*
-#%attr(755,root,root) %ghost %{_libdir}/libdigikamcore.so.4
 %attr(755,root,root) %{_libdir}/libkface.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkface.so.2
+%attr(755,root,root) %ghost %{_libdir}/libkface.so.3
 %attr(755,root,root) %{_libdir}/libkgeomap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkgeomap.so.1
+%attr(755,root,root) %ghost %{_libdir}/libkgeomap.so.2
 %attr(755,root,root) %{_libdir}/libkipiplugins.so.*.*.*
-#%attr(755,root,root) %ghost %{_libdir}/libkipiplugins.so.4
 %attr(755,root,root) %{_libdir}/libmediawiki.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmediawiki.so.1
 %attr(755,root,root) %{_libdir}/libkvkontakte.so.*.*.*
@@ -156,9 +162,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/kio_digikamsearch.so
 %attr(755,root,root) %{_libdir}/kde4/kio_digikamtags.so
 %attr(755,root,root) %{_libdir}/kde4/kipiplugin_*.so
-%attr(755,root,root) %{_libdir}/kde4/libexec/digikamdatabaseserver
 %{_mandir}/man1/digitaglinktree.1*
 %{_mandir}/man1/cleanup_digikamdb.1*
+%{_datadir}/appdata/digiKam*.xml
+%{_datadir}/appdata/digikam*.xml
+%{_datadir}/appdata/showfoto.appdata.xml
 %dir %{_datadir}/apps/digikam
 %{_datadir}/apps/digikam/about
 %{_datadir}/apps/digikam/importui.rc
@@ -205,14 +213,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libkipiplugins.so
 %attr(755,root,root) %{_libdir}/libmediawiki.so
 %attr(755,root,root) %{_libdir}/libkvkontakte.so
-%{_pkgconfigdir}/libkface.pc
-%{_pkgconfigdir}/libkgeomap.pc
-%{_pkgconfigdir}/libmediawiki.pc
-%{_datadir}/apps/cmake/modules/FindKGeoMap.cmake
-%{_datadir}/apps/cmake/modules/FindKface.cmake
-%{_datadir}/apps/cmake/modules/FindMediawiki.cmake
+%{_libdir}/cmake/Kface-*
 %{_libdir}/cmake/LibKVkontakte
-%{_includedir}/libkface
-%{_includedir}/libkvkontakte
-%{_includedir}/libkgeomap
-%{_includedir}/libmediawiki