Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=639a215d77d1d6cba4f41e8139671617e7ce543a

commit 639a215d77d1d6cba4f41e8139671617e7ce543a
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Fri Feb 11 21:10:53 2011 +0100

libreoffice-3.3.0.4-3-i686

- USE_DEVEL: bump to 3.3.1rc1
- drop unused OOo bits

diff --git a/source/xapps/libreoffice/FrugalBuild 
b/source/xapps/libreoffice/FrugalBuild
index ad746b0..1e09ee5 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -3,44 +3,29 @@
# Contributor: Laszlo Dvornik <dvor...@gnome.hu>

# build released development version
-USE_DEVEL=${USE_DEVEL:-"y"}
+USE_DEVEL=${USE_DEVEL:-"n"}
# build directly from git
USE_GIT=${USE_GIT:-"n"}
-Fuse $USE_GIT && USE_DEVEL="y"

-if ! Fuse $USE_DEVEL; then
-pkgname=openoffice.org
-else
pkgname=libreoffice
-fi

-if ! Fuse $USE_DEVEL; then
-       upstream=3.2.1
-       branch=-3-2-1
-       tree=ooo320
-       milestone=19
-       pkgver=$upstream
-       pkgrel=6
-       snapshot=4-23-ge68b7f9
+if Fuse $USE_GIT; then
+       upstream=3.3.0
+       tree=ooo330
+       milestone=7
+       pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
+       pkgrel=1
else
-       if Fuse $USE_GIT; then
-               upstream=3.3.0
-               tree=ooo330
-               milestone=7
-               pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
-               pkgrel=1
-       else
+       if ! Fuse $USE_DEVEL; then
pkgver=3.3.0.4
pkgrel=3
+       else
+               pkgver=3.3.1.1
+               pkgrel=1
fi
fi
-if ! Fuse $USE_DEVEL; then
-pkgdesc="OpenOffice.org, a full office productivity suite."
-url="http://www.openoffice.org/";
-else
pkgdesc="LibreOffice Productivity Suite, a fork of OpenOffice.org."
url="http://www.documentfoundation.org/download/";
-fi
_F_gnome_desktop="y"
Finclude gnome-scriptlet mono kde
unset install
@@ -58,57 +43,49 @@ makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'ecj' 
'apache-ant' \
'mythes' 'hyphen')
groups=('xapps')
archs=('i686' 'x86_64')
-if Fuse $USE_DEVEL; then
-       replaces=('openoffice.org')
-fi
-if ! Fuse $USE_DEVEL; then
-       up2date="lynx -dump http://download.openoffice.org/source/|grep 
Source|sed 's/.* \(.*\) .*/\1/;q'"
-       
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
 
http://git.frugalware.org/tarballs/openoffice.org/$tree-m$milestone-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions,l10n}.tar.bz2
 SA40775.diff)
-       signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' 
'' '' '' '' '')
+replaces=('openoffice.org')
+if Fuse $USE_GIT; then
+       unset source signatures
+       _F_scm_type="git"
+       _F_scm_url="git://anongit.freedesktop.org/git/libreoffice/build"
+       _F_scm_tag=$pkgver
+       Finclude scm
else
-       if Fuse $USE_GIT; then
-               unset source signatures
-               _F_scm_type="git"
-               _F_scm_url="git://anongit.freedesktop.org/git/libreoffice/build"
-               _F_scm_tag=$pkgver
-               Finclude scm
-       else
-               mirror="http://download.documentfoundation.org/libreoffice/src/";
-               _F_archive_name="libreoffice-build"
-               up2date="Flasttar $mirror"
-               modules=('artwork' 'base' 'bootstrap' 'calc'
-                       'components' 'extensions' 'extras' 'filters' 'help'
-                       'impress' 'l10n' 'libs-core' 'libs-extern-sys'
-                       'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing'
-                       'ure' 'writer' 'build')
-               source=()
-               for i in ${modules[@]}
-               do
-                       [ $i == build ] && ext=gz || ext=bz2
-                       source=(${source[@]} 
$mirror/libreoffice-$i-$pkgver.tar.$ext)
-                       signatures=(${signatures[@]} 
$mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
-               done
-               source=(${source[@]} 
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+       mirror="http://download.documentfoundation.org/libreoffice/src/";
+       _F_archive_name="libreoffice-build"
+       up2date="Flasttar $mirror"
+       modules=('artwork' 'base' 'bootstrap' 'calc'
+               'components' 'extensions' 'extras' 'filters' 'help'
+               'impress' 'l10n' 'libs-core' 'libs-extern-sys'
+               'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing'
+               'ure' 'writer' 'build')
+       source=()
+       for i in ${modules[@]}
+       do
+               [ $i == build ] && ext=gz || ext=bz2
+               source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext)
+               signatures=(${signatures[@]} 
$mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
+       done
+       source=(${source[@]} 
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+       signatures=("${signatures[@]}" '')
+       ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
+               fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \
+               ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \
+               1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \
+               798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
+               35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
+               cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
+       for i in ${ext_source[@]}
+       do
+               source=(${source[@]} 
http://hg.services.openoffice.org/binaries/$i)
signatures=("${signatures[@]}" '')
-               ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
\
-                       fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 
\
-                       ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \
-                       1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \
-                       798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
-                       35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
-                       cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
-               for i in ${ext_source[@]}
-               do
-                       source=(${source[@]} 
http://hg.services.openoffice.org/binaries/$i)
-                       signatures=("${signatures[@]}" '')
-               done
-               go_oo_source=(extras-3.1.tar.bz2 biblio.tar.bz2)
-               for i in ${go_oo_source[@]}
-               do
-                       source=(${source[@]} 
http://download.go-oo.org/SRC680/$i)
-                       signatures=("${signatures[@]}" '')
-               done
-       fi
+       done
+       go_oo_source=(extras-3.1.tar.bz2 biblio.tar.bz2)
+       for i in ${go_oo_source[@]}
+       do
+               source=(${source[@]} http://download.go-oo.org/SRC680/$i)
+               signatures=("${signatures[@]}" '')
+       done
fi
NOEXTRACT=1
options=(${options[@]} 'scriptlet')
@@ -130,23 +107,16 @@ subrodepends=("$pkgname=$pkgver" \
subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')
subgroups=('kde-extra' 'gnome-extra' 'devel-extra' 'devel-extra' 'xapps')
subinstall=("" "$_F_gnome_scriptlet" "" "" "")
-if Fuse $USE_DEVEL; then
-       subreplaces=('openoffice.org-kde' 'openoffice.org-gnome' 
'openoffice.org-sdk' 'openoffice.org-mono' 'openoffice.org-mozilla')
-fi
+subreplaces=('openoffice.org-kde' 'openoffice.org-gnome' 'openoffice.org-sdk' 
'openoffice.org-mono' 'openoffice.org-mozilla')

-if ! Fuse $USE_DEVEL; then
-       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 ca he ro"
-       completelangiso=('de' 'es' 'fr' 'hu' 'it' 'pt' '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' 'ja' 'km' 'kn-IN' 'ko' 'lo' 
'lt' 'lv' 'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' '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' 'bo' 'is' 'kid' 'ky' 'om' 'pap' 'ps' 'si' 'ug')
-       completelangdescs=('German' 'Spanish' 'French' 'Hungarian' 'Italian' 
'Portuguese' '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' 
'Japanese' 'Khmer (Cambodia)' 'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 
'Macedonian' 'Malay' 'Norwegian Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 
'Ndebele, South' 'NorthernSotho/Sepedi' 'Punjabi' 'Polish' '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' 'Kannada' 'Serbo-Croatian' 'Serbian' 'Uzbek' 
'Belarussian' 'Scottish Gaelic' 'Gujarati' 'Mongolian' 'Malay' 'Occitan' 'Bodo' 
'Dogri' 'Kazakh' 'Konkani' 'Kashmiri' 'Maithili' 'Manipuri' 'Romanian' 
'Sanskrit' 'Santali' 'Sardinian' 'Sindhi' 'Tibetan' 'Icelandic' 'Kid' 'Ky' 
'Afan Oromo' 'Pap' 'Pashto' 'Sinhala' 'Uyghur')
-else
-       # sed ':a;N;$!ba;s/\\\n//g' solenv/inc/postset.mk|grep 
^completelangiso=|sed 's/completelangiso=//;s/en-US //'
-       completelangiso=(af ar as ast be-BY bo bg br brx bn bs ca ca-XV cs cy
+# sed ':a;N;$!ba;s/\\\n//g' solenv/inc/postset.mk|grep ^completelangiso=|sed 
's/completelangiso=//;s/en-US //'
+completelangiso=(af ar as ast be-BY bo bg br brx bn bs ca ca-XV cs cy
da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is
it ja ky ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml mr my ne nb nl
nn nr ns om oc or pap pa-IN pl ps pt pt-BR ro ru rw sat sa-IN si sd sq sk sl sh
sr ss st sv sw-TZ te ti ta th tn tr ts tg ug ur uk uz ve vi xh zh-CN zh-TW zu)
-       # for i in ${completelangiso[@]}; do echo -n "'$(grep -1 
STR_NAME_MODULE_LANGPACK_$(echo $i|tr '[a-z]' '[A-Z]'|tr '-' '_') 
scp2/source/ooo/module_langpack.ulf|sed -n 's/.*"\(.*\)"/\1/;$ p')' "; done
-       completelangdescs=('Afrikaans' 'Arabic' 'Assamese' 'Asturian'
+# for i in ${completelangiso[@]}; do echo -n "'$(grep -1 
STR_NAME_MODULE_LANGPACK_$(echo $i|tr '[a-z]' '[A-Z]'|tr '-' '_') 
scp2/source/ooo/module_langpack.ulf|sed -n 's/.*"\(.*\)"/\1/;$ p')' "; done
+completelangdescs=('Afrikaans' 'Arabic' 'Assamese' 'Asturian'
'Belarusian' 'Tibetan' 'Bulgarian' 'Bodo' 'Bodo' 'Bengali (India)' 'Bosnian'
'Catalan (Valencian)' 'Catalan (Valencian)' 'Czech' 'Welsh' 'Danish' 'German'
'Dogri' 'Dzongkha' 'Greek' 'English (United Kingdom)' 'English (South Africa)'
@@ -164,7 +134,6 @@ else
'Telugu' 'Tigrinya' 'Tamil' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Tajik' 'Uyghur'
'Urdu' 'Ukrainian' 'Uzbek' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu')
-fi

if [ ${#completelangiso[@]} -ne ${#completelangdescs[@]} ]; then
error '${#completelangiso[@]} != ${#completelangdescs[@]}'
@@ -174,25 +143,16 @@ fi
i=0
while [ $i -lt ${#completelangiso[@]} ]
do
-       if ! Fuse $USE_DEVEL; then
-       subpkgs=("${subpkgs[@]}" "$pkgname-i18n-`echo ${completelangiso[$i]}|tr 
[A-Z] [a-z]`")
-       subdescs=("${subdescs[@]}" "${completelangdescs[$i]} Localization for 
OpenOffice.org.")
-       else
subpkgs=("${subpkgs[@]}" "$pkgname-l10n-`echo ${completelangiso[$i]}|tr [A-Z] 
[a-z]`")
subdescs=("${subdescs[@]}" "Installs ${completelangdescs[$i]} support in 
LibreOffice")
subreplaces=("${subreplaces[@]}" "openoffice.org-i18n-`echo 
${completelangiso[$i]}|tr [A-Z] [a-z]`")
-       fi
i=$(($i+1))
done

i=0
while [ $i -lt ${#completelangiso[@]} ]
do
-       if ! Fuse $USE_DEVEL && echo "$ooodicts"|grep -q 
${completelangiso[$i]}; then
-               subinstall=("${subinstall[@]}" 
"$pkgname.org-i18n-${completelangiso[$i]}.install")
-       else
-               subinstall=("${subinstall[@]}" '')
-       fi
+       subinstall=("${subinstall[@]}" '')
i=$(($i+1))
done

@@ -206,81 +166,20 @@ do
i=$(($i+1))
done

-if ! Fuse $USE_DEVEL; then
-       dictpath="/usr/lib/$pkgname/share/extension/install"
-else
-       dictpath="/usr/lib/$pkgname/share/extensions"
-fi
-
-gen_dict_scriptlet()
-{
-       lang=$1
-       out=$2
-       cat >${Fsrcdir%/src}/$out <<EOF
-post_install()
-{
-       unopkg add --shared $dictpath/dict-$lang.oxt 2>/dev/null
-}
-
-pre_upgrade()
-{
-       pre_remove
-}
-
-post_upgrade()
-{
-       post_install
-}
-
-pre_remove()
-{
-       unopkg remove --shared \$(unopkg list --shared|grep "^Identifier: 
org.openoffice.$lang"|sed 's/Identifier: //')
-}
-
-op=\$1
-shift
-\$op \$*
-EOF
-}
+dictpath="/usr/lib/$pkgname/share/extensions"

build()
{
Fmonoexport
-       if ! Fuse $USE_DEVEL; then
-               Fextract ooo-build$branch-$snapshot.tar.bz2
-               Fcd ooo-build$branch-$snapshot
-
-               # Hotfixes
-               for i in $Fsrcdir/*.diff
-               do
-                       ln -sf $i patches/hotfixes/ || Fdie
-               done
-
-               # Predownloaded tarballs
-               for i in $Fsrcdir/$tree-m$milestone-*
-               do
-                       ln -sf $i src/
-               done
+       if Fuse $USE_GIT; then
+               Funpack_scm
+               NOCONFIGURE=1 ./autogen.sh || return 1
else
-               if Fuse $USE_GIT; then
-                       Funpack_scm
-                       NOCONFIGURE=1 ./autogen.sh || return 1
-               else
-                       Fextract libreoffice-build-$pkgver.tar.gz
-                       Fcd libreoffice-build-$pkgver
-                       for i in $Fsrcdir/libreoffice-*
-                       do
-                               ln -sf $i src/
-                       done
-               fi
-       fi
-
-       if ! Fuse $USE_DEVEL; then
-               # Generate the dict scriptlets
-               gen_dict_scriptlet en $pkgname.install
-               for i in $ooodicts
+               Fextract libreoffice-build-$pkgver.tar.gz
+               Fcd libreoffice-build-$pkgver
+               for i in $Fsrcdir/libreoffice-*
do
-                       gen_dict_scriptlet $i $pkgname-i18n-$i.install
+                       ln -sf $i src/
done
fi

@@ -309,38 +208,24 @@ build()
# Optimize build.
export ARCH_FLAGS="$CFLAGS"

-       if ! Fuse $USE_DEVEL; then
-               Fconf --with-lang=ALL --without-git \
-                       --with-build-version="$pkgname-$pkgver-$pkgrel-$CARCH 
(ooo-build-${snapshot##*g})" \
-                       --with-jdk-home=/usr/lib/jvm/java-6-openjdk \
-                       --with-java-target-version=1.5 \
-                       --with-system-lucene \
-                       --with-lucene-core-jar=/usr/share/java/lucene-core.jar \
-                       
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
+       if Fuse $USE_GIT; then
+               Fconf 
--with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
-               if Fuse $USE_GIT; then
-                       Fconf 
--with-git=http://frugalware.org/git/pub/other/sources/libreoffice
-               else
-                       # mono-2.8 and mdds-0.5 are not yet supported
-                       Fconf --with-lang="en-US ${completelangiso[*]}" 
--disable-mono --without-system-mdds
-                       # avoid problems with ixion for now
-                       sed -i '/fields-table-formula.diff/d' 
patches/dev300/apply || return 1
-                       mkdir -p src
-                       for i in ${go_oo_source[@]}
-                       do
-                               ln -sf $Fsrcdir/$i src/
-                       done
-                       mkdir -p ext_source
-                       for i in ${ext_source[@]}
-                       do
-                               ln -sf $Fsrcdir/$i ext_source/
-                       done
-                       ln -sf $Fsrcdir/unowinreg.dll 
ext_source/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-               fi
-       fi
-
-       if ! Fuse $USE_DEVEL; then
-               ./download || return 1
+               # mono-2.8 and mdds-0.5 are not yet supported
+               Fconf --with-lang="en-US ${completelangiso[*]}" --disable-mono 
--without-system-mdds
+               # avoid problems with ixion for now
+               sed -i '/fields-table-formula.diff/d' patches/dev300/apply || 
return 1
+               mkdir -p src
+               for i in ${go_oo_source[@]}
+               do
+                       ln -sf $Fsrcdir/$i src/
+               done
+               mkdir -p ext_source
+               for i in ${ext_source[@]}
+               do
+                       ln -sf $Fsrcdir/$i ext_source/
+               done
+               ln -sf $Fsrcdir/unowinreg.dll 
ext_source/185d60944ea767075d27247c3162b3bc-unowinreg.dll
fi

# make patch be less strict
@@ -354,28 +239,26 @@ build()

Fmakeinstall

-       if Fuse $USE_DEVEL; then
-               # Install artwork
-               cat src/openintro_fw.png > 
$Fdestdir/usr/lib/$pkgname/program/intro.png
-               cat src/openabout_fw.png > 
$Fdestdir/usr/lib/$pkgname/program/about.png
-               Fsed 'ProgressPosition=164,225' 'ProgressPosition=116,195' 
$Fdestdir/usr/lib/libreoffice/program/sofficerc
+       # Install artwork
+       cat src/openintro_fw.png > $Fdestdir/usr/lib/$pkgname/program/intro.png
+       cat src/openabout_fw.png > $Fdestdir/usr/lib/$pkgname/program/about.png
+       Fsed 'ProgressPosition=164,225' 'ProgressPosition=116,195' 
$Fdestdir/usr/lib/libreoffice/program/sofficerc

-               # Use desktop files from sysui, those have correct
-               # lowriter instead of non-existing oowriter, etc.
-               for i in $Fdestdir/usr/share/applications/*.desktop
-               do
-                       file=$(basename $i)
-                       if [ -e $Fdestdir/usr/lib/libreoffice/share/xdg/$file 
]; then
-                               Fln /usr/lib/libreoffice/share/xdg/$file 
/usr/share/applications/$file
-                       fi
-               done
-               # Use libreoffice-gulls instead of non-existing 
libreoffice-startcenter icon
-               Fsed 'libreoffice-startcenter' 'libreoffice-gulls' 
$Fdestdir/usr/lib/libreoffice/share/xdg/startcenter.desktop
-               for i in $Fdestdir/usr/share/pixmaps/ooo-*
-               do
-                       mv $i $(echo $i|sed 's/ooo/libreoffice/') || return 1
-               done
-       fi
+       # Use desktop files from sysui, those have correct
+       # lowriter instead of non-existing oowriter, etc.
+       for i in $Fdestdir/usr/share/applications/*.desktop
+       do
+               file=$(basename $i)
+               if [ -e $Fdestdir/usr/lib/libreoffice/share/xdg/$file ]; then
+                       Fln /usr/lib/libreoffice/share/xdg/$file 
/usr/share/applications/$file
+               fi
+       done
+       # Use libreoffice-gulls instead of non-existing libreoffice-startcenter 
icon
+       Fsed 'libreoffice-startcenter' 'libreoffice-gulls' 
$Fdestdir/usr/lib/libreoffice/share/xdg/startcenter.desktop
+       for i in $Fdestdir/usr/share/pixmaps/ooo-*
+       do
+               mv $i $(echo $i|sed 's/ooo/libreoffice/') || return 1
+       done

# Permission fixes
find $Fdestdir/usr/lib/$pkgname/program -name "*.so" ! -perm 755 -exec chmod 
755 {} \;
@@ -404,20 +287,6 @@ build()
fi
done
rm build/lang_${upkg}_list.txt
-               if ! Fuse $USE_DEVEL; then
-                       dictext=".oxt"
-                       if [ "$i" = "de" ]; then
-                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-de-AT$dictext
-                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-de-CH$dictext
-                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-de-DE$dictext
-                       elif [ "$i" = "nb" ]; then
-                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-no$dictext
-                       elif [ "$i" = "ku" ]; then
-                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-ku-TR$dictext
-                       elif echo "$ooodicts"|grep -q $i && [ -e 
$Fdestdir/$dictpath/dict-$i$dictext ]; then
-                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-$i$dictext
-                       fi
-               fi
done

## Split KDE stuff
@@ -441,24 +310,14 @@ build()
Fsplit $pkgname-mono $(grep -v '^%dir' build/mono_list.txt)
rm build/mono_list.txt

-       if ! Fuse $USE_DEVEL; then
+       if false; then
+               # FIXME move this to the start of the build
# Check for missing language packs.
misslangs="`find $Fdestdir -type f |grep registry/res/.*/org|sed 
's|.*registry/res/\(.*\)/org.*|\1|'|grep -v en-US|sort -u`"
if [ -n "$misslangs" ]; then
Fmessage "Unsplit languages: $misslangs"
return 1
fi
-
-               # Check for missing dict packs.
-               if ! Fuse $USE_DEVEL; then
-                       missdicts="`find $Fdestdir -type f |grep dict-.*oxt 
|sed 's/.*dict-\(.*\).oxt/\1/'|grep -v en|sort -u`"
-               else
-                       missdicts="`find $Fdestdir -type d |grep 'dict-[^/]\+$' 
|sed 's/.*dict-\(.*\)/\1/'|grep -v en|sort -u`"
-               fi
-               if [ -n "$missdicts" ]; then
-                       Fmessage "Unsplit dicts: $missdicts"
-                       return 1
-               fi
fi

# Check for missing subpkgs.
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to