X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=digikam.spec;h=4ec2ec53388f8688251781ec54e6b34ab263a1cf;hb=93cbaab2ef4b666541493d9e0d3251ba8385475f;hp=46e3eaa580d442032f1f966f3395cb49d28e79ce;hpb=c373d0b8387152766a90948aa19d63f76dfce8bb;p=packages%2Fdigikam.git

diff --git a/digikam.spec b/digikam.spec
index 46e3eaa..4ec2ec5 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,22 +1,24 @@
 #
-%define		qtver	4.7.4
-%define		kdever	4.7.1
+%define		qtver	4.8.0
+%define		kdever	4.8.0
 
 Summary:	A KDE frontend for gphoto2
 Summary(pl.UTF-8):	Interfejs KDE do gphoto2
 Name:		digikam
-Version:	2.1.1
-Release:	2
+Version:	2.5.0
+Release:	1
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
-# Source0-md5:	8cd3f5f2141bbb54ba2fd80371582c2c
+# Source0-md5:	770355060d2033a044c21b0f155be00c
+Patch0:		digikam-2.5.0-libkipi-1.4.0.patch
 URL:		http://www.digikam.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtDesigner-devel >= %{qtver}
 BuildRequires:	QtSql-devel >= %{qtver}
 BuildRequires:	QtSvg-devel >= %{qtver}
+BuildRequires:	QtXmlPatterns-devel >= %{qtver}
 BuildRequires:	automoc4
 BuildRequires:	clapack-devel
 BuildRequires:	cmake >= 2.8.0
@@ -28,15 +30,15 @@ BuildRequires:	lcms-devel
 BuildRequires:	lensfun-devel
 BuildRequires:	libf2c-devel
 BuildRequires:	libgphoto2-devel
-BuildRequires:	libkdcraw-devel >= %{kdever}
-BuildRequires:	libkdeedu-devel >= %{kdever}
-BuildRequires:	libkexiv2-devel >= %{kdever}
-BuildRequires:	libkipi-devel >= %{kdever}
-BuildRequires:	libksane-devel >= %{kdever}
+BuildRequires:	kde4-libkdcraw-devel >= %{kdever}
+BuildRequires:	kde4-libkdeedu-devel >= %{kdever}
+BuildRequires:	kde4-libkexiv2-devel >= %{kdever}
+BuildRequires:	kde4-libkipi-devel >= %{kdever}
+BuildRequires:	kde4-libksane-devel >= %{kdever}
 BuildRequires:	liblqr-devel >= 0.4.0
 BuildRequires:	libpgf-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	marble-devel >= %{kdever}
+BuildRequires:	kde4-marble-devel >= %{kdever}
 # fixed mysql_install_db in this version
 BuildRequires:	mysql-extras >= 5.5.9-2
 BuildRequires:	opencv-devel
@@ -74,6 +76,9 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
 
 %prep
 %setup -q
+cd core
+%patch0 -p1
+cd ..
 
 %build
 install -d build
@@ -116,7 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dnginfo
 %attr(755,root,root) %{_bindir}/expoblending
 %attr(755,root,root) %{_bindir}/libkgeomap_demo
+%attr(755,root,root) %{_bindir}/multithread
 %attr(755,root,root) %{_bindir}/panoramagui
+%attr(755,root,root) %{_bindir}/photolayoutseditor
 %attr(755,root,root) %{_bindir}/scangui
 %{_datadir}/apps/digikam/lensfun
 %dir %{_datadir}/apps/digikam/utils
@@ -166,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/kipiplugin_*
 %{_datadir}/apps/libkface
 %{_datadir}/apps/libkgeomap
+%{_datadir}/apps/photolayoutseditor
 %{_datadir}/apps/showfoto
 %{_datadir}/kde4/services/digikamalbums.protocol
 %{_datadir}/kde4/services/digikamdates.protocol
@@ -178,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/digikam/digikam.notifyrc
 %{_datadir}/apps/solid/actions/digikam-opencamera.desktop
 %{_datadir}/kde4/servicetypes/digikamimageplugin.desktop
+%{_datadir}/kde4/servicetypes/photolayoutseditorborderplugin.desktop
+%{_datadir}/kde4/servicetypes/photolayoutseditoreffectplugin.desktop
+%{_datadir}/config.kcfg/PLEConfigSkeleton.kcfgc
 %{_iconsdir}/*/*/actions/*.png
 %{_iconsdir}/*/*/actions/*.svgz
 %{_iconsdir}/*/*/apps/*.png