allow to download main source tarballs again

The file "core.ver" was removed in configure together with other "core.*"
files. It was ugly name. Better to use "sources.ver" and the variable
"lo_sources_ver=..."

The source version is not used in "unpack-sources", so do not source the .ver file
at all.

The source tarballs are put into "major.minor.micro" version subdirectory
on the download site now.

1 files changed, 7 insertions, 5 deletions

diff --git a/download b/download
index 4476fef54880..99139ef94cc7 100755
--- a/download
+++ b/download
@@ -183,15 +183,17 @@ if [ "$COM" = "MSC" ]; then
     downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd"
 fi
 
-if [ -f $start_dir/core.ver -a ! -d $start_dir/.git ] ; then
-    # core is from sources, so get the other source tarballs
-    . $start_dir/core.ver
+if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
+    # these sources are from a tarball, so get the other source tarballs
+    . $start_dir/sources.ver
+    # sources are put into "major.minor.micro" version directory on the dowload site, e.g. "3.5.2"
+    lo_bugfix_release_sources_ver=`echo $lo_sources_ver | sed -e "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"`
     lo_src_dir="$start_dir/src"
     mkdir -p "$lo_src_dir"
     for piece in `cat $start_dir/bin/repo-list` ; do
-        tarname="libreoffice-$piece-$lo_core_ver"
+        tarname="libreoffice-$piece-$lo_sources_ver"
         if [ ! -f "$TARFILE_LOCATION/$tarname.tar.xz" ] ; then
-	    downloaditem "http://download.documentfoundation.org/libreoffice/src/" "$tarname.tar.xz" ""
+	    downloaditem "http://download.documentfoundation.org/libreoffice/src/$lo_bugfix_release_sources_ver" "$tarname.tar.xz" ""
 	fi
 	$start_dir/bin/unpack-sources $start_dir $TARFILE_LOCATION/$tarname.tar.xz
     done