X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kde4-calligra.spec;h=f0f9ea101d2bbb12573f9a715fe2298dcdb98d58;hb=4a2d74d;hp=0f0a1ec6488cb0e8cf914445530f527ba9a39d20;hpb=7df6d44710313f7187ad90e290ff9846c51e6493;p=packages%2Fkde4-calligra.git

diff --git a/kde4-calligra.spec b/kde4-calligra.spec
index 0f0a1ec..f0f9ea1 100644
--- a/kde4-calligra.spec
+++ b/kde4-calligra.spec
@@ -28,7 +28,7 @@ Summary:	Calligra - powerful office suite for KDE
 Summary(pl.UTF-8):	Calligra - potężny pakiet biurowy dla KDE
 Name:		kde4-calligra
 Version:	2.9.11
-Release:	1
+Release:	5
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	https://download.kde.org/Attic/%{orgname}-%{version}/%{orgname}-%{version}.tar.xz
@@ -37,6 +37,7 @@ Patch0:		eigen3.patch
 Patch1:		%{orgname}-exiv2.patch
 Patch2:		%{orgname}-icu.patch
 Patch3:		%{orgname}-boost.patch
+Patch4:		build.patch
 URL:		http://www.calligra-suite.org/
 BuildRequires:	GraphicsMagick-devel
 BuildRequires:	OpenColorIO-devel
@@ -71,18 +72,21 @@ BuildRequires:	kde4-libksane-devel >= %{kdever}
 BuildRequires:	kde4-marble-devel >= %{kdever}
 BuildRequires:	kde4-okular-devel >= %{kdever}
 BuildRequires:	lcms2-devel
-#BuildRequires:	libetonyek-devel < 0.1
+BuildRequires:	libetonyek-devel
 BuildRequires:	libexif-devel >= 0.6.12
-BuildRequires:	libicu-devel
+#BuildRequires:	libicu-devel
+# Prevents rebuilding with different library than the one Qt4 is stuck on
+BuildRequires:	libicu67-devel
 BuildRequires:	libjpeg-devel
-#BuildRequires:	libodfgen-devel < 0.1
+BuildRequires:	libodfgen-devel
 BuildRequires:	libpng-devel
 %{?with_pqxx:BuildRequires:	libpqxx-devel >= 4.0.0}
 BuildRequires:	libspnav-devel
 BuildRequires:	libtiff-devel
 #BuildRequires:	libvisio-devel < 0.1
 BuildRequires:	libwpd-devel
-#BuildRequires:	libwpg-devel >= 0.2 < 0.3
+BuildRequires:	libwpg-devel
+#BuildRequires:	libwps-devel
 BuildRequires:	libxml2-devel >= 0:2.4.8
 BuildRequires:	libxslt-devel >= 1.0.7
 BuildRequires:	mysql-devel
@@ -106,7 +110,6 @@ BuildRequires:	xbase-devel
 BuildRequires:	zlib-devel
 Obsoletes:	kde4-koffice
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-#uildRequires:	libwps-devel >= 0.2 < 0.3
 
 %description
 Calligra is an integrated office suite for K Desktop Environment.
@@ -380,6 +383,7 @@ the Plasma Active platform.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 install -d build