[SM-Commit] GIT changes to master binary grimoire by Bor Kraljič (6f0d2572ebf0c09cbd1dca6e37e14a139722834a)

Bor Kraljič scm at sourcemage.org
Mon Jan 31 06:53:10 EST 2011


GIT changes to master binary grimoire by Bor Kraljič <pyrobor at ver.si>:

 bin-editors/libreoffice-bin-lang/CONFIGURE |    8 ++++----
 bin-editors/libreoffice-bin-lang/DETAILS   |    6 ++++--
 bin-editors/libreoffice-bin-lang/HISTORY   |    1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 6f0d2572ebf0c09cbd1dca6e37e14a139722834a
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    libreoffice-bin-lang: added URL_ARCH so download works on ia32 arch

diff --git a/bin-editors/libreoffice-bin-lang/CONFIGURE b/bin-editors/libreoffice-bin-lang/CONFIGURE
index cf8b839..d5411e0 100755
--- a/bin-editors/libreoffice-bin-lang/CONFIGURE
+++ b/bin-editors/libreoffice-bin-lang/CONFIGURE
@@ -15,15 +15,15 @@ $LANG_LIST &&
       local  i=1                        &&
       for  LANGUAGE  in  $LIBO_LANG;  do
         if  [[  $i  ==  1  ]]; then
-          echo  SOURCE=LibO_\${VERSION}_Linux_${SMGL_COMPAT_ARCHS[1]/_/-}_langpack-rpm_$LANGUAGE.tar.gz  >>  $CFG  &&
-          echo  SOURCE_URL[0]=\$SITE/${SMGL_COMPAT_ARCHS[1]}/\$SOURCE    >>  $CFG  &&
+          echo  SOURCE=LibO_\${VERSION}_Linux_\${URL_ARCH/_/-}_langpack-rpm_$LANGUAGE.tar.gz  >>  $CFG  &&
+          echo  SOURCE_URL[0]=\$SITE/\${URL_ARCH}/\$SOURCE    >>  $CFG  &&
           echo  SOURCE$(($i+1))=\$SOURCE.asc                              >>  $CFG  &&
           echo  SOURCE$(($i+1))_URL[0]=\${SOURCE_URL[0]}.asc              >>  $CFG  &&
           echo  SOURCE_GPG=libreoffice.gpg:\$SOURCE$(($i+1)):UPSTREAM_KEY >>  $CFG  &&
           echo  SOURCE$(($i+1))_IGNORE=signature                         >>  $CFG 
         else
-          echo  SOURCE$i=LibO_\${VERSION}_Linux_${SMGL_COMPAT_ARCHS[1]/_/-}_langpack-rpm_$LANGUAGE.tar.gz  >>  $CFG  &&
-          echo  SOURCE${i}_URL[0]=\$SITE/${SMGL_COMPAT_ARCHS[1]}/\$SOURCE$i  >>  $CFG
+          echo  SOURCE$i=LibO_\${VERSION}_Linux_\${URL_ARCH/_/-}_langpack-rpm_$LANGUAGE.tar.gz  >>  $CFG  &&
+          echo  SOURCE${i}_URL[0]=\$SITE/\${URL_ARCH}/\$SOURCE$i  >>  $CFG
           echo  SOURCE$(($i+1))=\$SOURCE${i}.asc                              >>  $CFG  &&
           echo  SOURCE$(($i+1))_URL[0]=\${SOURCE${i}_URL[0]}.asc                >>  $CFG  &&
           echo  SOURCE${i}_GPG=libreoffice.gpg:\$SOURCE$(($i+1)):UPSTREAM_KEY   >>  $CFG  &&
diff --git a/bin-editors/libreoffice-bin-lang/DETAILS b/bin-editors/libreoffice-bin-lang/DETAILS
index dfb0a48..741649e 100755
--- a/bin-editors/libreoffice-bin-lang/DETAILS
+++ b/bin-editors/libreoffice-bin-lang/DETAILS
@@ -4,12 +4,14 @@
             SITE="http://download.documentfoundation.org/libreoffice/stable/$VERSION/rpm/"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
        LANG_LIST="cs de es fi fr hr it ja nl pl pt ru sl tr"
-source $SPELL_CONFIG
 if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
-       LIBO_ARCH="${SMGL_COMPAT_ARCHS[1]}"
+       LIBO_ARCH="x86_64"
+        URL_ARCH="x86_64"
 else
        LIBO_ARCH="i586"
+        URL_ARCH="x86"
 fi
+source $SPELL_CONFIG
       LICENSE[0]=LGPL
         WEB_SITE=http://www.libreoffice.org/
          ENTERED=20110127
diff --git a/bin-editors/libreoffice-bin-lang/HISTORY b/bin-editors/libreoffice-bin-lang/HISTORY
index 6cda1a9..f5ab8e1 100644
--- a/bin-editors/libreoffice-bin-lang/HISTORY
+++ b/bin-editors/libreoffice-bin-lang/HISTORY
@@ -1,4 +1,5 @@
 2011-01-31 Bor Kraljič <pyrobor at ver.si>
+	* CONFIGURE, DETAILS: added URL_ARCH so download works on ia32 arch
 	* DETAILS: fixed LIBO_ARCH for ia32 arch (x86 -> i586)
 
 2011-01-28 Bor Kraljič <pyrobor at ver.si>



More information about the SM-Commit mailing list