Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

Chronological Thread  
    < 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č (42cba926146553f87d5f6da241298f830bf814fd)
  • Date: Thu, 27 Jan 2011 13:41:15 -0600
GIT changes to master binary grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 3 ++
bin-editors/libreoffice-bin-help/BUILD | 1
bin-editors/libreoffice-bin-help/CONFIGURE | 43
+++++++++++++++++++++++++++++
bin-editors/libreoffice-bin-help/DEPENDS | 1
bin-editors/libreoffice-bin-help/DETAILS | 15 ++++++++++
bin-editors/libreoffice-bin-help/HISTORY | 2 +
bin-editors/libreoffice-bin-help/INSTALL | 7 ++++
bin-editors/libreoffice-bin-help/PRE_BUILD | 25 ++++++++++++++++
bin-editors/libreoffice-bin-lang/CONFIGURE | 18 ++++++++----
bin-editors/libreoffice-bin-lang/HISTORY | 1
bin-editors/libreoffice-bin-lang/PRE_BUILD | 2 -
bin-editors/libreoffice-bin/DETAILS | 9 ++++--
bin-editors/libreoffice-bin/HISTORY | 1
bin-editors/libreoffice.gpg |binary
14 files changed, 119 insertions(+), 9 deletions(-)

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

bin-editors/libreoffice-bin-help: added, help files for libreoffice-bin

commit 38455c11ad904f9b319ec2981ba563a3bb559264
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libreoffice-bin-lang: modified to use upstream signature checking

commit 119d4adb5358727cee00decace4069dce24afe08
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libreoffice-bin: converted to upstream signature checking

Now with upstream checking we could even more simplify DETAILS.
Make generic source with SMGL_COMPAT_ARCHS and using it for LIBO_ARCH.

commit 5ded804cc338dde0cddbdd902008816225d2589f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

bin-editors/libreoffice.gpg: added keyring with AFEEAEA3 LibreOffice
Build Team (CODE SIGNING KEY) <build AT documentfoundation.org>

diff --git a/ChangeLog b/ChangeLog
index 946e8e9..9266dff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2011-01-27 Bor Kraljič <pyrobor AT ver.si>
* bin-editors/libreoffice-bin: added binary version of LibreOffice
* bin-editors/libreoffice-bin-lang: added, language support for
libreoffice-bin
+ * bin-editors/libreoffice-bin-help: added, help files for
libreoffice-bin
+ * bin-editors/libreoffice.gpg: added keyring with AFEEAEA3,
LibreOffice Build Team
+ (CODE SIGNING KEY) <build AT documentfoundation.org>

2010-04-26 Eric Sandall <sandalle AT sourcemage.org>
* bin-games/gametable: Added a shared whiteboard client
diff --git a/bin-editors/libreoffice-bin-help/BUILD
b/bin-editors/libreoffice-bin-help/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/bin-editors/libreoffice-bin-help/BUILD
@@ -0,0 +1 @@
+true
diff --git a/bin-editors/libreoffice-bin-help/CONFIGURE
b/bin-editors/libreoffice-bin-help/CONFIGURE
new file mode 100755
index 0000000..c695330
--- /dev/null
+++ b/bin-editors/libreoffice-bin-help/CONFIGURE
@@ -0,0 +1,43 @@
+source $GRIMOIRE/config_query_multi.function &&
+
+local CFG=$SPELL_CONFIG
+
+get_libohelplanguages() {
+ local i LANGUAGE LANGUAGES &&
+ rm -f $CFG &&
+ touch $CFG &&
+
+list_remove LIBO_HELPLANG vi || true &&
+
+config_query_multi LIBO_HELPLANG "please specify the desired languages" \
+en-US de fi fr nl pl sl &&
+
+ 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$(($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+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 &&
+ echo SOURCE$(($i+1))_IGNORE=signature
>> $CFG
+ fi &&
+ i=$[$i+2]
+ done
+}
+
+if [[ -z $LIBO_HELPLANG ]] || query "Reconfigure?" n
+then
+ get_libohelplanguages
+else
+ message "${MESSAGE_COLOR}Using existing config${DEFAULT_COLOR}"
+fi &&
+
+. $CFG
diff --git a/bin-editors/libreoffice-bin-help/DEPENDS
b/bin-editors/libreoffice-bin-help/DEPENDS
new file mode 100755
index 0000000..d5cdd6a
--- /dev/null
+++ b/bin-editors/libreoffice-bin-help/DEPENDS
@@ -0,0 +1 @@
+depends libreoffice-bin
diff --git a/bin-editors/libreoffice-bin-help/DETAILS
b/bin-editors/libreoffice-bin-help/DETAILS
new file mode 100755
index 0000000..88e4aa5
--- /dev/null
+++ b/bin-editors/libreoffice-bin-help/DETAILS
@@ -0,0 +1,15 @@
+# the remaining details of this spell are provided by CONFIGURE
+ SPELL=libreoffice-bin-help
+ VERSION=3.3.0
+
SITE="http://download.documentfoundation.org/libreoffice/stable/$VERSION/rpm/";
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+source $SPELL_CONFIG
+ LIBO_ARCH="${SMGL_COMPAT_ARCHS[1]}"
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.libreoffice.org/
+ ENTERED=20081124
+ ARCHIVE="off"
+ SHORT="helppacks for libreoffice"
+cat << EOF
+helppacks for libreoffice
+EOF
diff --git a/bin-editors/libreoffice-bin-help/HISTORY
b/bin-editors/libreoffice-bin-help/HISTORY
new file mode 100644
index 0000000..e0ddd85
--- /dev/null
+++ b/bin-editors/libreoffice-bin-help/HISTORY
@@ -0,0 +1,2 @@
+2011-01-27 Bor Kraljič <pyrobor AT ver.si>
+ * all: spell created
diff --git a/bin-editors/libreoffice-bin-help/INSTALL
b/bin-editors/libreoffice-bin-help/INSTALL
new file mode 100755
index 0000000..a5f540d
--- /dev/null
+++ b/bin-editors/libreoffice-bin-help/INSTALL
@@ -0,0 +1,7 @@
+INSTALLDIR=$INSTALL_ROOT/opt &&
+mkdir -pv $INSTALLDIR/ &&
+local SS &&
+for SS in $LIBO_HELPLANG; do
+ cd $SOURCE_DIRECTORY/LibO*$SS*/RPMS &&
+ cp -Rv opt/* $INSTALLDIR
+done
diff --git a/bin-editors/libreoffice-bin-help/PRE_BUILD
b/bin-editors/libreoffice-bin-help/PRE_BUILD
new file mode 100755
index 0000000..c878652
--- /dev/null
+++ b/bin-editors/libreoffice-bin-help/PRE_BUILD
@@ -0,0 +1,25 @@
+. $SPELL_CONFIG &&
+
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+
+# unpack all source files
+local i SS &&
+i=1 &&
+for SS in $LIBO_HELPLANG; do
+ if [[ $i == 1 ]];then
+ unpack_file
+ else
+ unpack_file $i
+ fi &&
+ # silently unpack RPMS for each language
+ cd LibO*$SS*/RPMS &&
+ for FILE in *.${LIBO_ARCH}.rpm
+ do
+ FILE="${FILE%.$LIBO_ARCH.rpm}" &&
+ rpm2tar $FILE.${LIBO_ARCH}.rpm &&
+ tar xvf $FILE.${LIBO_ARCH}.tar
+ done &&
+ cd $SOURCE_DIRECTORY &&
+ i=$[$i+2]
+done
diff --git a/bin-editors/libreoffice-bin-lang/CONFIGURE
b/bin-editors/libreoffice-bin-lang/CONFIGURE
index 499590b..af5cf0e 100755
--- a/bin-editors/libreoffice-bin-lang/CONFIGURE
+++ b/bin-editors/libreoffice-bin-lang/CONFIGURE
@@ -10,20 +10,26 @@ get_libolanguages() {
list_remove LIBO_LANG vi || true &&

config_query_multi LIBO_LANG "please specify the desired languages" \
-fr nl sl &&
+de fi fr nl pl sl &&

-# should perhaps use SOURCE_IGNORE=unversioned instead of MD5[0]="IGNORE"
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_URL[0]=\$SITE/${SMGL_COMPAT_ARCHS[1]}/\$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}_URL[0]=\$SITE/${SMGL_COMPAT_ARCHS[1]}/\$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 &&
+ echo SOURCE$(($i+1))_IGNORE=signature
>> $CFG
fi &&
- echo MD5[$[$i-1]]="IGNORE" >> $CFG &&
- i=$[$i+1]
+ i=$[$i+2]
done
}

diff --git a/bin-editors/libreoffice-bin-lang/HISTORY
b/bin-editors/libreoffice-bin-lang/HISTORY
index e0ddd85..85b0bfc 100644
--- a/bin-editors/libreoffice-bin-lang/HISTORY
+++ b/bin-editors/libreoffice-bin-lang/HISTORY
@@ -1,2 +1,3 @@
2011-01-27 Bor Kraljič <pyrobor AT ver.si>
+ * CONFIGURE, PRE_BUILD: modified to use upstream signature checking
* all: spell created
diff --git a/bin-editors/libreoffice-bin-lang/PRE_BUILD
b/bin-editors/libreoffice-bin-lang/PRE_BUILD
index 5c9db3c..700ca90 100755
--- a/bin-editors/libreoffice-bin-lang/PRE_BUILD
+++ b/bin-editors/libreoffice-bin-lang/PRE_BUILD
@@ -21,5 +21,5 @@ for SS in $LIBO_LANG; do
tar xvf $FILE.${LIBO_ARCH}.tar
done &&
cd $SOURCE_DIRECTORY &&
- i=$[$i+1]
+ i=$[$i+2]
done
diff --git a/bin-editors/libreoffice-bin/DETAILS
b/bin-editors/libreoffice-bin/DETAILS
index bf23842..1986ddf 100755
--- a/bin-editors/libreoffice-bin/DETAILS
+++ b/bin-editors/libreoffice-bin/DETAILS
@@ -4,17 +4,22 @@ if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
VERSION=3.3.0
BUILD_VERSION=6
SOURCE=LibO_${VERSION}_Linux_x86-64_install-rpm_en-US.tar.gz
-
SOURCE_HASH=sha512:ecae8a02893d0cb7580ee281c456e104e702abcf9a75212b8fa65dc7a5bd4c237a6e817c40c27827ada915d628c4d5497c28fdb52e09e017150980b2c45f0fa9
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG=libreoffice.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
LIBO_ARCH="x86_64"
else
VERSION=3.3.0
BUILD_VERSION=6
SOURCE=LibO_${VERSION}_Linux_x86_install-rpm_en-US.tar.gz
-
SOURCE_HASH=sha512:6f9e8d017d80d31cf4c4d61354068a043f513d7395286902df2ee1660bcf7c1290086626ba07da28b566b58c002da80400a072d38cfb7af69fb8b5970f394d8c
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG=libreoffice.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
LIBO_ARCH="x86"
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_URL[0]=http://download.documentfoundation.org/${SPELLX}/stable/${VERSION}/rpm/${SMGL_COMPAT_ARCHS[1]}/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
LICENSE[0]=LGPL
WEB_SITE=http://www.libreoffice.org/
ENTERED=20110127
diff --git a/bin-editors/libreoffice-bin/HISTORY
b/bin-editors/libreoffice-bin/HISTORY
index e0ddd85..9e01e7b 100644
--- a/bin-editors/libreoffice-bin/HISTORY
+++ b/bin-editors/libreoffice-bin/HISTORY
@@ -1,2 +1,3 @@
2011-01-27 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: converted to upstream signature checking
* all: spell created
diff --git a/bin-editors/libreoffice.gpg b/bin-editors/libreoffice.gpg
new file mode 100644
index 0000000..356f5b6
Binary files /dev/null and b/bin-editors/libreoffice.gpg differ


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

Archive powered by MHonArc 2.6.24.

Top of Page