diff --git a/libreoffice.spec b/libreoffice.spec index 40b5dec..cdaeff9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -25,8 +25,6 @@ # 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_with libcmis %if %{with langpacks} %if 0%{?rhel} && 0%{?rhel} < 7 @@ -73,14 +71,11 @@ Source18: http://dev-www.libreoffice.org/src/3c0037fb07dea2f0bbae8386fa7c6 Source19: http://dev-www.libreoffice.org/src/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 Source20: http://dev-www.libreoffice.org/src/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 Source21: http://dev-www.libreoffice.org/src/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 -Source22: http://dev-www.libreoffice.org/src/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz +Source22: http://dev-www.libreoffice.org/src/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz Source23: http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz Source24: http://dev-www.libreoffice.org/src/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 Source25: http://dev-www.libreoffice.org/src/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz %endif -%if %{with libcmis} -Source26: http://dev-www.libreoffice.org/src/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz -%endif # build tools BuildRequires: autoconf @@ -134,10 +129,8 @@ BuildRequires: libXinerama-devel BuildRequires: libXt-devel %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: libcdr-devel -%if %{without libcmis} BuildRequires: libcmis-devel >= 0.3.0 %endif -%endif BuildRequires: libcurl-devel %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: libexttextcat-devel @@ -1039,7 +1032,6 @@ 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 5045188..15fbd4f 100644 --- a/sources +++ b/sources @@ -7,7 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -b2371dc7cf4811c9d32146eec913d296 b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz f0abec2ab5b8a31ba47b00f9cfea0305 libreoffice-4.0.0.0.beta2.tar.xz 847b75db75e5b0a501216bb5420083d2 libreoffice-help-4.0.0.0.beta2.tar.xz b6caba12606c6616ff283fea4575d118 libreoffice-translations-4.0.0.0.beta2.tar.xz