Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ebf691db9b8517efceb4fde951aca18f866002c8
commit ebf691db9b8517efceb4fde951aca18f866002c8
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Tue May 12 10:11:42 2009 +0200
openoffice.org-3.1.0-1-i686
- version bump
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 52a2611..aaf10e2 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -5,14 +5,14 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"n"}
if ! Fuse $USE_DEVEL; then
- upstream=3.0.1
- branch=-3-0-1
- tree=ooo300
+ upstream=3.1.0
+ branch=-3-1
+ tree=ooo310
dir=`echo $tree|tr [a-z] [A-Z]`
- milestone=15
+ milestone=11
pkgver=$upstream
pkgrel=1
- snapshot=r15151
+ snapshot=bb48d86
else
upstream=3.1.0
branch=-3-1
@@ -51,9 +51,9 @@ else
up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/$path/configure.in?view=markup |grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
fi
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
\
-http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,writer,impress,artwork,filters,testing,bootstrap,libs-gui,libs-core,libs-extern,components,postprocess,libs-extern-sys,extensions}.tar.bz2
\
+http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,writer,impress,artwork,filters,testing,bootstrap,libs-gui,libs-core,libs-extern,components,postprocess,libs-extern-sys,extensions,extras,help}.tar.bz2
\
mono24-hack)
-signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' ''
'' '')
NOEXTRACT=1
options=(${optio...@]} 'scriptlet')
@@ -66,12 +66,12 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
subgroups=('kde-extra' 'gnome-extra' 'devel-extra')
subinstall=("" "$_F_gnome_scriptlet" "")
-ooodicts="af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sv sw th vi zu"
+ooodicts="af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv sw th vi
zu"
ooosubpkgs=('de' 'es' 'fr' 'hu')
ooosubdescs=('German' 'Spanish' 'French' 'Hungarian')
if ! Fuse $USE_DEVEL; then
- ooosubpkgs=(${ooosubpk...@]} 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD'
'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi'
'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv'
'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw'
'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn'
'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN'
'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz' 'by'
'gd' 'gu' 'mn' 'my' 'oc')
- ooosubdescs=(${ooosubdes...@]} 'Afrikaans' 'Arabic' 'Belarusian'
'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton'
'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English
(South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician'
'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)'
'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian
Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South'
'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)'
'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic'
'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai'
'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam'
'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha'
'Georgian' 'Kan
nada' 'Serbo-Croatian' 'Serbian' 'Uzbek' 'Belarussian' 'Scottish Gaelic'
'Gujarati' 'Mongolian' 'Malay' 'Occitan')
+ ooosubpkgs=(${ooosubpk...@]} 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD'
'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi'
'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv'
'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw'
'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn'
'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN'
'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz' 'by'
'gd' 'gu' 'mn' 'my' 'oc' 'brx' 'dgo' 'kk' 'kok' 'ks' 'mai' 'mni' 'ro' 'sa-IN'
'sat' 'sc' 'sd' 'sr')
+ ooosubdescs=(${ooosubdes...@]} 'Afrikaans' 'Arabic' 'Belarusian'
'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton'
'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English
(South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician'
'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)'
'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian
Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South'
'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)'
'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic'
'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai'
'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam'
'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha'
'Georgian' 'Kan
nada' 'Serbo-Croatian' 'Serbian' 'Uzbek' 'Belarussian' 'Scottish Gaelic'
'Gujarati' 'Mongolian' 'Malay' 'Occitan' 'Bodo' 'Dogri' 'Kazakh' 'Konkani'
'Kashmiri' 'Maithili' 'Manipuri' 'Romanian' 'Sanskrit' 'Santali' 'Sardinian'
'Sindhi' 'Serbian')
fi
if [ ${#ooosubpk...@]} -ne ${#ooosubdes...@]} ]; then
@@ -107,6 +107,7 @@ do
i=$(($i+1))
done
+dictpath="/usr/lib/openoffice.org/share/extension/install"
gen_dict_scriptlet()
{
lang=$1
@@ -114,7 +115,7 @@ gen_dict_scriptlet()
cat >${Fsrcdir%/src}/$out <<EOF
post_install()
{
- unopkg add --shared
/usr/lib/openoffice.org/share/extension/install/dict-$lang.oxt 2>/dev/null
+ unopkg add --shared $dictpath/dict-$lang.oxt 2>/dev/null
}
pre_upgrade()
@@ -221,9 +222,14 @@ build()
spkg=`echo $i|tr [A-Z] [a-z]`
# en-GB -> en_GB
upkg=`echo $i|sed 's/-/_/g'`
- Fsplit openoffice.org-i18n-$spkg $(grep -v '^%dir'
build/lang_${upkg}_list.txt)
- if echo "$ooodicts"|grep -q $i; then
- Fsplit openoffice.org-i18n-$spkg
/usr/lib/openoffice.org/share/extension/install/dict-$i.oxt
+ for j in $(grep -v '^%dir' build/lang_${upkg}_list.txt)
+ do
+ if [ -e $Fdestdir/$j ]; then
+ Fsplit openoffice.org-i18n-$spkg $j
+ fi
+ done
+ if echo "$ooodicts"|grep -q $i && [ -e
$Fdestdir/$dictpath/dict-$i.oxt ]; then
+ Fsplit openoffice.org-i18n-$spkg $dictpath/dict-$i.oxt
fi
done
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
