[calligra] 2.4.0

[Rex Dieter]

commit 5c1c302612264f4161fb1420fd6e7a6e7faad524
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 7 11:55:46 2012 -0500

    2.4.0
    
    - Obsoletes: -map-shape (dropped since rc2)

 .gitignore                           |    3 +--
 calligra-2.4.0-libreoffice_sdk.patch |   20 ++++++++++++++++++++
 calligra.spec                        |   28 +++++++++++++++++++++++++---
 sources                              |    2 +-
 4 files changed, 47 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f45fa9..a5f613c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/calligra-2.3.91.tar.bz2
-/calligra-2.3.92.tar.bz2
+/calligra-2.4.0.tar.bz2
diff --git a/calligra-2.4.0-libreoffice_sdk.patch b/calligra-2.4.0-libreoffice_sdk.patch
new file mode 100644
index 0000000..6e6990f
--- /dev/null
+++ b/calligra-2.4.0-libreoffice_sdk.patch
@@ -0,0 +1,20 @@
+diff -up calligra-2.4.0/cmake/modules/FindOOoSDK.cmake.libreoffice calligra-2.4.0/cmake/modules/FindOOoSDK.cmake
+--- calligra-2.4.0/cmake/modules/FindOOoSDK.cmake.libreoffice	2012-04-06 10:37:56.000000000 -0500
++++ calligra-2.4.0/cmake/modules/FindOOoSDK.cmake	2012-04-07 11:23:53.427800438 -0500
+@@ -19,6 +19,7 @@ find_path(OOOSDK_URE_DIR
+ 	      /usr/lib/ure
+ 	      /usr/lib64/openoffice.org/ure
+ 	      /usr/lib64/libreoffice/ure
++	      /usr/lib/libreoffice/ure
+ )
+ if (NOT OOOSDK_URE_DIR)
+ 	set(OOOSDK_ERROR "Could not find share/misc/types.rdb for OOoSDK.")
+@@ -33,6 +34,8 @@ find_path(OOOSDK_DIR
+ 	      /usr/lib64/openoffice.org/basis3.2
+ 	      /usr/lib64/openoffice.org/basis3.3
+ 	      /usr/lib64/libreoffice/basis3.3
++	      /usr/lib64/libreoffice
++	      /usr/lib/libreoffice
+ )
+ if (OOOSDK_DIR)
+ 	find_path(CPPUHELPER_INCLUDE_DIR
diff --git a/calligra.spec b/calligra.spec
index 8ab52f0..be06895 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -7,20 +7,21 @@
 %endif
 
 Name:    calligra 
-Version: 2.3.92
+Version: 2.4.0
 Release: 1%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
 URL:     http://www.calligra-suite.org/
-Source0: http://download.kde.org/unstable/calligra-%{version}/calligra-%{version}.tar.bz2
+Source0: http://download.kde.org/stable/calligra-%{version}/calligra-%{version}.tar.bz2
 
 ## upstreamable patches
 # fix FTBFS with gcc-4.7
 Patch50: calligra-2.3.87-gcc47.patch
 # scripts missed tables->sheets rename
 Patch51: calligra-2.3.92-tables_to_sheets.patch
-
+# fix libreoffice-sdk detection
+Patch52: calligra-2.4.0-libreoffice_sdk.patch
 
 ## upstream patches
 
@@ -41,15 +42,23 @@ BuildRequires: pkgconfig(GraphicsMagick)
 BuildRequires: pkgconfig(gsl) 
 BuildRequires: kdelibs4-devel
 BuildRequires: kdepimlibs-devel
+# see -DIHAVEPATCHEDQT:BOOL=ON below
+BuildRequires: qt4-devel >= 4.8.1-5
 BuildRequires: pkgconfig(lcms2)
 BuildRequires: pkgconfig(gl) pkgconfig(glu) 
 BuildRequires: libjpeg-devel
+#if 0%{?map_shape}
 BuildRequires: marble-devel
+#endif
 BuildRequires: okular-devel
 BuildRequires: pkgconfig(icu-i18n)
 BuildRequires: pkgconfig(libkdcraw)
 BuildRequires: pkgconfig(poppler-qt4)
 BuildRequires: pkgconfig(libpng)
+## FTBFS 
+## cd .../calligra-2.4.0/x86_64-redhat-linux-gnu/tools/slidecompare/ooosdkinclude && /usr/lib64/libreoffice/sdk/bin/cppumaker -BUCR /usr/lib64/libreoffice/ure/share/misc/types.rdb /usr/lib64/libreoffice/program/offapi.rdb
+## cppumaker : init registries failed, check your registry files.
+#BuildRequires: libreoffice-sdk
 BuildRequires: libspnav-devel
 BuildRequires: libtiff-devel
 # pkgconfig(libwpd-0.8) or pkgconfig(libwpd-0.9)
@@ -96,7 +105,9 @@ Requires:  %{name}-kformula = %{version}-%{release}
 %endif
 Requires:  %{name}-plan = %{version}-%{release}
 Requires:  %{name}-okular-odpgenerator = %{version}-%{release}
+%if 0%{?map_shape}
 Requires:  %{name}-map-shape = %{version}-%{release}
+%endif
 Requires:  %{name}-reports-map-element = %{version}-%{release}
 
 %description
@@ -112,6 +123,9 @@ Provides:  calligra-filters = %{version}-%{release}
 Obsoletes: %{name}-kformula < %{version}-%{release}
 Obsoletes: %{name}-kformula-libs < %{version}-%{release}
 %endif
+%if ! 0%{?map_shape}
+Obsoletes: %{name}-map-shape < %{version}-%{release}
+%endif
 %if 0%{?external_lilypond_fonts}
 Requires: lilypond-emmentaler-fonts
 %endif
@@ -411,6 +425,7 @@ Requires: okular%{?_kde4_version: >= %{_kde4_version}}
 
 %patch50 -p1 -b .gcc47
 %patch51 -p1 -b .tables_to_sheets
+%patch52 -p1 -b .libreoffice_sdk
 
 ## kdchart munging begin
 pushd plugins/chartshape/kdchart
@@ -434,6 +449,7 @@ pushd %{_target_platform}
   -DBUILD_cstester:BOOL=OFF \
   -DBUILD_koabstraction:BOOL=OFF \
   -DBUILD_mobile:BOOL=OFF \
+  -DIHAVEPATCHEDQT:BOOL=ON \
   ..
 popd
 
@@ -730,9 +746,11 @@ fi
 %{_kde4_libdir}/libkformulaprivate.so.*
 %endif
 
+%if 0%{?map_shape}
 %files map-shape
 %{_kde4_libdir}/kde4/mapshape.so
 %{_kde4_datadir}/kde4/services/mapshape.desktop
+%endif
 
 %files reports-map-element
 %{_kde4_libdir}/kde4/koreport_mapsplugin.so
@@ -1100,6 +1118,10 @@ fi
 
 
 %changelog
+* Sat Apr 07 2012 Rex Dieter <rdieter at fedoraproject.org> 2.4.0-1
+- 2.4.0
+- Obsoletes: -map-shape (dropped since rc2)
+
 * Sat Mar 17 2012 Rex Dieter <rdieter at fedoraproject.org> 2.3.92-1
 - 2.3.92 (2.4rc2)
 - rename -tables => -sheets
diff --git a/sources b/sources
index a3af6cd..9c4d8ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4121631cf148e801cca29e2167b1806d  calligra-2.3.92.tar.bz2
+a45b9141c6bb750569e8f6554197dd50  calligra-2.4.0.tar.bz2