From 9455761a1f2090d0f0e42f4ac547ff17654bc207 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 29 Nov 2012 13:08:56 +0100
Subject: [PATCH] avoid the need to have system libcmis 0.3 for now

---
 .gitignore       |  1 +
 libreoffice.spec | 10 +++++++++-
 sources          |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9ca4156..68a779f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /libreoffice-help-4.0.0.0.alpha1.tar.xz
 /libreoffice-translations-4.0.0.0.alpha1.tar.xz
 /0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
diff --git a/libreoffice.spec b/libreoffice.spec
index 4c64419..ef98fb4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -25,6 +25,8 @@
 # so it is necessary to change this to bcond_with to achieve the same
 # effect
 %bcond_without langpacks
+# simplify building before libcmis-0.3 is available
+%bcond_without libcmis
 
 %if %{with langpacks}
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -78,6 +80,9 @@ Source25:       http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfd
 Source26:       http://dev-www.libreoffice.org/src/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 Source27:       http://dev-www.libreoffice.org/src/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 %endif
+%if %{with libcmis}
+Source28:       http://dev-www.libreoffice.org/src/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
+%endif
 
 # build tools
 BuildRequires: autoconf
@@ -130,7 +135,9 @@ BuildRequires: libXinerama-devel
 BuildRequires: libXt-devel
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: libcdr-devel
-BuildRequires: libcmis-devel
+%if %{without libcmis}
+BuildRequires: libcmis-devel >= 0.3
+%endif
 %endif
 BuildRequires: libcurl-devel
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -924,6 +931,7 @@ touch autogen.lastrun
  %{?with_lang} --with-poor-help-localizations="$POORHELPS" \
  --with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \
  %{distrooptions} \
+ %{?with_libcmis:--without-system-libcmis} \
  --disable-fetch-external
 
 if ! make VERBOSE=true; then
diff --git a/sources b/sources
index 95320cc..d78e79e 100644
--- a/sources
+++ b/sources
@@ -11,3 +11,4 @@ b3912d2b9f8312a3b85472890997704d  libreoffice-help-4.0.0.0.alpha1.tar.xz
 9dfdbac725c0a31b411026108cf7cf22  libreoffice-translations-4.0.0.0.alpha1.tar.xz
 0168229624cfac409e766913506961a8  0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 f82cd768a220188dafa78207b5728d14  redhat-langpacks.tar.gz
+b2371dc7cf4811c9d32146eec913d296  b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz