Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master binary grimoire by Bor Kraljič (df91b8316ab63427a94047b03a7a371a16cb2f13)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master binary grimoire by Bor Kraljič (df91b8316ab63427a94047b03a7a371a16cb2f13)
  • Date: Mon, 31 Jan 2011 06:35:05 -0600

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

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

New commits:
commit df91b8316ab63427a94047b03a7a371a16cb2f13
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libreoffice-bin-lang: added missing "&&"

commit 5973a933328a81e654d5a64c3485a55195a3c740
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

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

diff --git a/bin-editors/libreoffice-bin-help/CONFIGURE
b/bin-editors/libreoffice-bin-help/CONFIGURE
index 5b8103a..ceda6e7 100755
--- a/bin-editors/libreoffice-bin-help/CONFIGURE
+++ b/bin-editors/libreoffice-bin-help/CONFIGURE
@@ -15,15 +15,15 @@ $HELPLANG_LIST &&
local i=1 &&
for LANGUAGE in $LIBO_HELPLANG; do
if [[ $i == 1 ]]; then
- echo
SOURCE=LibO_\${VERSION}_Linux_${SMGL_COMPAT_ARCHS[1]/_/-}_helppack-rpm_$LANGUAGE.tar.gz
>> $CFG &&
- echo SOURCE_URL[0]=\$SITE/${SMGL_COMPAT_ARCHS[1]}/\$SOURCE >>
$CFG &&
+ echo
SOURCE=LibO_\${VERSION}_Linux_\${URL_ARCH/_/-}_helppack-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]/_/-}_helppack-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/_/-}_helppack-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-help/DETAILS
b/bin-editors/libreoffice-bin-help/DETAILS
index aa25f64..ebd22e8 100755
--- a/bin-editors/libreoffice-bin-help/DETAILS
+++ b/bin-editors/libreoffice-bin-help/DETAILS
@@ -4,12 +4,14 @@

SITE="http://download.documentfoundation.org/libreoffice/stable/$VERSION/rpm/";
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
HELPLANG_LIST="en-US 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-help/HISTORY
b/bin-editors/libreoffice-bin-help/HISTORY
index 4c8ef66..3ba6787 100644
--- a/bin-editors/libreoffice-bin-help/HISTORY
+++ b/bin-editors/libreoffice-bin-help/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>
diff --git a/bin-editors/libreoffice-bin-lang/CONFIGURE
b/bin-editors/libreoffice-bin-lang/CONFIGURE
index d5411e0..83b3c0d 100755
--- a/bin-editors/libreoffice-bin-lang/CONFIGURE
+++ b/bin-editors/libreoffice-bin-lang/CONFIGURE
@@ -23,7 +23,7 @@ $LANG_LIST &&
echo SOURCE$(($i+1))_IGNORE=signature >>
$CFG
else
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}_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/HISTORY
b/bin-editors/libreoffice-bin-lang/HISTORY
index f5ab8e1..9601f82 100644
--- a/bin-editors/libreoffice-bin-lang/HISTORY
+++ b/bin-editors/libreoffice-bin-lang/HISTORY
@@ -1,5 +1,6 @@
2011-01-31 Bor Kraljič <pyrobor AT ver.si>
- * CONFIGURE, DETAILS: added URL_ARCH so download works on ia32 arch
+ * CONFIGURE, DETAILS: added URL_ARCH so download works on ia32 arch,
+ added missing "&&"
* DETAILS: fixed LIBO_ARCH for ia32 arch (x86 -> i586)

2011-01-28 Bor Kraljič <pyrobor AT ver.si>



  • [SM-Commit] GIT changes to master binary grimoire by Bor Kraljič (df91b8316ab63427a94047b03a7a371a16cb2f13), Bor Kraljič, 01/31/2011

Archive powered by MHonArc 2.6.24.

Top of Page