Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f095ba92535d7a80eb6ca75e30d09e64c4143608

commit f095ba92535d7a80eb6ca75e30d09e64c4143608
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Aug 18 12:26:43 2011 +0200

libreoffice-3.4.2.3-1-i686

- source fix

diff --git a/source/xapps/libreoffice/FrugalBuild 
b/source/xapps/libreoffice/FrugalBuild
index 0eab268..b3caf5d 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -4,7 +4,8 @@

pkgname=libreoffice
pkgver=3.4.2.3
-branch=3.4
+minor=${pkgver%%.?} # x.y.z
+major=${pkgver%%.?.?} # x.y
pkgrel=1
pkgdesc="LibreOffice Productivity Suite, a fork of OpenOffice.org."
url="http://www.documentfoundation.org/download/";
@@ -26,7 +27,7 @@ makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'ecj' 
'apache-ant' \
groups=('xapps')
archs=('i686' 'x86_64')
replaces=('ooextras')
-mirror="http://download.documentfoundation.org/libreoffice/src/";
+mirror="http://download.documentfoundation.org/libreoffice/src/$minor";
_F_archive_name="libreoffice-bootstrap"
up2date="Flasttar $mirror"
modules=('artwork' 'base' 'bootstrap' 'calc'
@@ -41,14 +42,14 @@ do
source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext)
signatures=(${signatures[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
done
-ext_source=(http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 \
-       
http://download.go-oo.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 \
-       
http://download.go-oo.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 \
-       
http://download.go-oo.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 \
-       
http://download.go-oo.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 \
-       
http://download.go-oo.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
-       
http://download.go-oo.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
-       
http://download.go-oo.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip)
+ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 \
+       
http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 \
+       
http://dev-www.libreoffice.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 \
+       
http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 \
+       
http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 \
+       
http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 \
+       
http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 \
+       
http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip)
for i in ${ext_source[@]}
do
source=(${source[@]} $i)
@@ -219,8 +220,8 @@ build()
Fmkdir /usr/share/{applications,icons}
for i in base calc draw impress math writer
do
-               Fsed "libreoffice$branch" 'libreoffice' 
$Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Exec=
-               Fsed "libreoffice${branch/.}-" '' 
$Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Icon=
+               Fsed "libreoffice$major" 'libreoffice' 
$Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Exec=
+               Fsed "libreoffice${major/.}-" '' 
$Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Icon=
Fln /usr/lib/libreoffice/share/xdg/$i.desktop /usr/share/applications/$i.desktop
done
cd -
@@ -260,14 +261,14 @@ build()
done

## Split KDE stuff
-       echo /usr/lib/libreoffice/basis$branch/program/fps_kde4.uno.so >> 
$Fdestdir/gid_Module_Optional_Kde
-       echo /usr/lib/libreoffice/basis$branch/program/libvclplug_kde4l*.so >> 
$Fdestdir/gid_Module_Optional_Kde
+       echo /usr/lib/libreoffice/basis$major/program/fps_kde4.uno.so >> 
$Fdestdir/gid_Module_Optional_Kde
+       echo /usr/lib/libreoffice/basis$major/program/libvclplug_kde4l*.so >> 
$Fdestdir/gid_Module_Optional_Kde
Fsplit $pkgname-kde $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Kde|sort -u)

## Split GNOME stuff
sed -i '/ucpgvfs1.uno.so/d' $Fdestdir/gid_Module_Optional_Gnome
-       echo /usr/lib/libreoffice/basis$branch/program/fps_gnome.uno.so >> 
$Fdestdir/gid_Module_Optional_Gnome
-       echo /usr/lib/libreoffice/basis$branch/program/libvclplug_gtkl*.so >> 
$Fdestdir/gid_Module_Optional_Gnome
+       echo /usr/lib/libreoffice/basis$major/program/fps_gnome.uno.so >> 
$Fdestdir/gid_Module_Optional_Gnome
+       echo /usr/lib/libreoffice/basis$major/program/libvclplug_gtkl*.so >> 
$Fdestdir/gid_Module_Optional_Gnome
Fsplit $pkgname-gnome $(grep -v '^%dir' 
$Fdestdir/gid_Module_Optional_Gnome|sort -u)
Fbuild_gnome_scriptlet
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to