[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - Makefile.in
David Tardon
dtardon at redhat.com
Mon Aug 4 12:04:53 PDT 2014
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6cbe7ec6a027aab829e1a800542ec3796ec719ae
Author: David Tardon <dtardon at redhat.com>
Date: Mon Aug 4 19:34:03 2014 +0200
fdo#82136 fix download of submodule tarballs
Change-Id: I07775391cb905f0563d1d1b3cae6f02b12d10f90
(cherry picked from commit 922b03f0818baa65e4c036f58fe7f8c29776b81e)
Reviewed-on: https://gerrit.libreoffice.org/10738
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/Makefile.in b/Makefile.in
index 09b9465..9db0823 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,7 @@ $(if $(gb_LO_VER),,$(error Error while retrieving $$lo_sources_ver from $(SRCDIR
get-submodules: | download
ifneq ($(foreach i,$(subst helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),$(SRCDIR)/src/libreoffice-$(i)-$(gb_LO_VER)),$(wildcard $(foreach i,$(subst helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),$(SRCDIR)/src/libreoffice-$(i)-$(gb_LO_VER))))
$(foreach i,$(subst helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),\
- $(call fetch_Download_item,http://download.documentfoundation.org/libreoffice/src/$(shell echo $(gb_LO_VER) | sed -e "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"),libreoffice-$(i)-$(gb_LO_VER).tar.xz,no-check))
+ $(call fetch_Download_item_unchecked,http://download.documentfoundation.org/libreoffice/src/$(shell echo $(gb_LO_VER) | sed -e "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"),libreoffice-$(i)-$(gb_LO_VER).tar.xz))
$(SRCDIR)/bin/unpack-sources $(SRCDIR) $(foreach i,$(subst helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),\
$(TARFILE_LOCATION)/libreoffice-$(i)-$(gb_LO_VER).tar.xz)
endif
More information about the Libreoffice-commits
mailing list