avoid the need to have system libcmis 0.3 for now

f41
David Tardon 12 years ago
parent 9d853ddb7e
commit 9455761a1f

1
.gitignore vendored

@ -34,3 +34,4 @@
/libreoffice-help-4.0.0.0.alpha1.tar.xz /libreoffice-help-4.0.0.0.alpha1.tar.xz
/libreoffice-translations-4.0.0.0.alpha1.tar.xz /libreoffice-translations-4.0.0.0.alpha1.tar.xz
/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz /0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz

@ -25,6 +25,8 @@
# so it is necessary to change this to bcond_with to achieve the same # so it is necessary to change this to bcond_with to achieve the same
# effect # effect
%bcond_without langpacks %bcond_without langpacks
# simplify building before libcmis-0.3 is available
%bcond_without libcmis
%if %{with langpacks} %if %{with langpacks}
%if 0%{?rhel} && 0%{?rhel} < 7 %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 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 Source27: http://dev-www.libreoffice.org/src/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
%endif %endif
%if %{with libcmis}
Source28: http://dev-www.libreoffice.org/src/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
%endif
# build tools # build tools
BuildRequires: autoconf BuildRequires: autoconf
@ -130,7 +135,9 @@ BuildRequires: libXinerama-devel
BuildRequires: libXt-devel BuildRequires: libXt-devel
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libcdr-devel BuildRequires: libcdr-devel
BuildRequires: libcmis-devel %if %{without libcmis}
BuildRequires: libcmis-devel >= 0.3
%endif
%endif %endif
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
@ -924,6 +931,7 @@ touch autogen.lastrun
%{?with_lang} --with-poor-help-localizations="$POORHELPS" \ %{?with_lang} --with-poor-help-localizations="$POORHELPS" \
--with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \ --with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \
%{distrooptions} \ %{distrooptions} \
%{?with_libcmis:--without-system-libcmis} \
--disable-fetch-external --disable-fetch-external
if ! make VERBOSE=true; then if ! make VERBOSE=true; then

@ -11,3 +11,4 @@ b3912d2b9f8312a3b85472890997704d libreoffice-help-4.0.0.0.alpha1.tar.xz
9dfdbac725c0a31b411026108cf7cf22 libreoffice-translations-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 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
f82cd768a220188dafa78207b5728d14 redhat-langpacks.tar.gz f82cd768a220188dafa78207b5728d14 redhat-langpacks.tar.gz
b2371dc7cf4811c9d32146eec913d296 b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz

Loading…
Cancel
Save