- BR libicu67-devel to we don't end up mixing two versions of the same library

[packages/kde4-calligra.git] / kde4-calligra.spec

diff --git a/kde4-calligra.spec b/kde4-calligra.spec
index a1f1349dd560e2054ecc62b1c7660d8c922e5658..f0f9ea101d2bbb12573f9a715fe2298dcdb98d58 100644 (file)
--- 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:       3
+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
@@ -73,7 +74,9 @@ BuildRequires:        kde4-okular-devel >= %{kdever}
 BuildRequires: lcms2-devel
 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
 BuildRequires: libpng-devel
@@ -380,6 +383,7 @@ the Plasma Active platform.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 install -d build