[arch-commits] Commit in openoffice-base/trunk (5 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Aug 7 21:47:03 UTC 2009
Date: Friday, August 7, 2009 @ 17:47:03
Author: andyrtr
Revision: 49433
upgpkg: openoffice-base 3.1.0.99-1
new version 3.1.1rc1; adopt changes made to the -beta pkg over the last weeks
Added:
openoffice-base/trunk/startcenter.desktop
Modified:
openoffice-base/trunk/ChangeLog
openoffice-base/trunk/PKGBUILD
openoffice-base/trunk/openoffice.install
Deleted:
openoffice-base/trunk/template.desktop
---------------------+
ChangeLog | 9 +++++
PKGBUILD | 77 ++++++++++++++++++++++++--------------------------
openoffice.install | 5 +--
startcenter.desktop | 48 +++++++++++++++++++++++++++++++
template.desktop | 50 --------------------------------
5 files changed, 98 insertions(+), 91 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-08-07 21:28:41 UTC (rev 49432)
+++ ChangeLog 2009-08-07 21:47:03 UTC (rev 49433)
@@ -1,3 +1,12 @@
+2009-08-07 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.0.91-ooo310_m18-1 :
+ - 3.1.1rc1
+ - backup sofficerc file to fix
+ http://bugs.archlinux.org/task/15161
+ - move all files to /usr/lib
+ - add startcenter menu entry, drop templates entry
+
2009-07-03 Andreas Radke <andyrtr at archlinux.org>
* 3.1.0-5 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-08-07 21:28:41 UTC (rev 49432)
+++ PKGBUILD 2009-08-07 21:47:03 UTC (rev 49433)
@@ -2,16 +2,16 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base
-pkgver=3.1.0
-pkgrel=5
+pkgver=3.1.0.99 # = 3.1.1 RC1
+pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-_OO_milestone=OOO310_m11 # =RC2 = final
+_OO_milestone=OOO310_m18 # =RC1 = final ?
license=('LGPL3')
url="http://www.openoffice.org"
install=openoffice.install
-depends=('curl>=7.19.4' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd' 'redland'
- 'libxaw' 'neon>=0.28.3-2' 'dbus-glib' 'icu>=4.2' 'hsqldb-java' 'libxslt' 'desktop-file-utils')
+depends=('curl>=7.19.5' 'hunspell>=1.2.8' 'python>=2.6.2' 'libwpd' 'redland' 'libxaw' 'neon>=0.28.4'
+ 'dbus-glib' 'icu>=4.2.1' 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils')
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
'gconf: adds additional gnome support'
@@ -19,9 +19,10 @@
'pstoedit: translates PostScript and PDF graphics into other vector formats')
makedepends=('bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.1-2'
- 'apache-ant>=1.7.1-2' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost'
+ 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-5')
+backup=(usr/lib/openoffice/program/sofficerc)
source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
- template.desktop
+ startcenter.desktop
default-no-startup-wizard.diff
default-system-fpicker.diff
soffice-detect-mozilla-certificates.diff
@@ -32,8 +33,8 @@
buildfix-sw-printf.diff
openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch)
options=('!distcc' '!ccache' '!makeflags')
-md5sums=('650d8f2b648b291688bed9821f9dda91'
- '5e22f876c3c5d4754af394399e9bf375'
+md5sums=('262d74d80c8a7e2905ae507ae88bdd8d'
+ '90897451b6cfed490e481f06d45408aa'
'71f136a31e296a04ab68932a31dd533e'
'6c596129fb48316226ce3adfd3a4c86d'
'1dc7480a04f572ad136d35923a2af66d'
@@ -44,7 +45,6 @@
'2461119a2b7f1580f997f504a76a1c98'
'75c7e5dd7cf4c266f48565fb6425f8c4')
-
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
build() {
@@ -62,7 +62,6 @@
[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
JAVAHOME=${JAVA_HOME}
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-
[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
# some speedups
@@ -177,10 +176,6 @@
--with-use-shell=bash\
$EXTRAOPTS || return 1
-#
-# --disable-mozilla\
-# --with-system-boost\
-
# Setup environment for build
if [ "$CARCH" = "x86_64" ]; then
source LinuxX86-64Env.Set.sh
@@ -200,44 +195,45 @@
else cp -R instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/* ${pkgdir}/
fi
- cd ${pkgdir}/opt/
+ # move all to /usr/lib
+ mkdir -p ${pkgdir}/usr/lib
+ mv ${pkgdir}/opt/* ${pkgdir}/usr/lib/
+ rmdir ${pkgdir}/opt
## Step 1
- cd ${pkgdir}/opt/openoffice.org || return 1
+ cd ${pkgdir}/usr/lib/openoffice.org || return 1
mv ure/ basis3.1/ || return 1
cd basis3.1 || return 1
rm ure-link && mv ure ure-link || return 1
## Step 2
- cd ${pkgdir}/opt/ || return 1
+ cd ${pkgdir}/usr/lib/ || return 1
mv openoffice.org/basis3.1/ openoffice.org3/ || return 1
cd openoffice.org3/ || return 1
rm basis-link && mv basis3.1 basis-link || return 1
## Step 3
- cd ${pkgdir}/opt/ || return 1
- rmdir ${pkgdir}/opt/openoffice.org || return 1
+ cd ${pkgdir}/usr/lib/ || return 1
+ rmdir ${pkgdir}/usr/lib/openoffice.org || return 1
mv openoffice.org3 openoffice || return 1
- # prepare filesystem entries
- mkdir -p ${pkgdir}/usr/{bin,share/applications}
- mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
-
- # make symlinks
- cd ${pkgdir}/usr/bin
- ln -s ../../opt/openoffice/program/soffice soffice
- ln -s ../../opt/openoffice/program/spadmin spadmin
-
# install all built dictionaries from source tree
- pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlng?6.pro/bin
+ pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlng?6.pro/bin
for i in `ls -1 dict-??.oxt`; do
- install -D -m644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i || return 1
+ install -D -m644 $i ${pkgdir}/usr/lib/openoffice/share/extension/install/$i || return 1
done
popd
+ # prepare filesystem entries
+ mkdir -p ${pkgdir}/usr/{bin,share/applications}
+ mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
+
# install shortcuts
- mv ${pkgdir}/opt/openoffice/share/xdg/*.desktop ${pkgdir}/usr/share/applications
+ mv ${pkgdir}/usr/lib/openoffice/share/xdg/*.desktop ${pkgdir}/usr/share/applications
+ # add startcenter desktop file
+ install -D -m644 ${srcdir}/startcenter.desktop ${pkgdir}/usr/share/applications/startcenter.desktop || return 1
+
cd ${pkgdir}/usr/share/applications
- sed -i -e 's|Exec=openoffice.org3|Exec=/opt/openoffice/program/soffice|g' *.desktop || return 1
- sed -i -e 's|Exec=/opt/openoffice/program/soffice-printeradmin|Exec=/opt/openoffice/program/spadmin|g' printeradmin.desktop || return 1
+ sed -i -e 's|Exec=openoffice.org3|Exec=/usr/bin/soffice|g' *.desktop || return 1
+ sed -i -e 's|Exec=/usr/bin/soffice-printeradmin|Exec=/usr/bin/spadmin|g' printeradmin.desktop || return 1
# fix exec commands in shortcuts for Xfce menu
sed -i -e 's|base %U|base|g' base.desktop || return 1
sed -i -e 's|calc %U|calc|g' calc.desktop || return 1
@@ -247,10 +243,8 @@
sed -i -e 's|writer %U|writer|g' writer.desktop || return 1
# remove quickstarter, we disabled it above
rm -rf ${pkgdir}/usr/share/applications/qstart.desktop
- # fix icons in shortcuts
+ # fix icons in desktop files
sed -i -e 's|Icon=openofficeorg3-|Icon=|g' *.desktop
- # add template desktop file
- install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop || return 1
# install icons
cd ${srcdir}/${_OO_milestone}/sysui/desktop/icons
@@ -264,11 +258,16 @@
# fix ownership and permissions
chown root.root -R ${pkgdir}/
chmod +rX -R ${pkgdir}/usr
-
+
+ # make symlinks
+ cd ${pkgdir}/usr/bin
+ ln -s /usr/lib/openoffice/program/soffice soffice
+ ln -s /usr/lib/openoffice/program/spadmin spadmin
+
# link the mozilla-plugin
mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
cd ${pkgdir}/usr/lib/mozilla/plugins/
- ln -v -s /opt/openoffice/program/libnpsoplugin.so .
+ ln -v -s /usr/lib/openoffice/program/libnpsoplugin.so .
# set desktop variable to force gtk/gnome vcl usage
install -m755 -d ${pkgdir}/etc/profile.d
Modified: openoffice.install
===================================================================
--- openoffice.install 2009-08-07 21:28:41 UTC (rev 49432)
+++ openoffice.install 2009-08-07 21:47:03 UTC (rev 49433)
@@ -6,8 +6,9 @@
echo " * relogin or source /etc/profile.d/openoffice.sh"
echo " * see http://wiki.archlinux.org/index.php/Openoffice"
echo " how to use extensions, e.g. for spell checking"
-echo " see /opt/openoffice/share/extension/install what"
+echo " see /usr/lib/openoffice/share/extension/install what"
echo " is shipped with this package"
+echo " * make sure you have installed a ttf font (ttf-dejavu recommended)"
}
post_upgrade() {
@@ -20,6 +21,6 @@
# make sure everything is gone, maybe someone has installed
# extensions for all users using unopkg --shared
-rm -rf /opt/openoffice
+rm -rf /usr/lib/openoffice
}
Added: startcenter.desktop
===================================================================
--- startcenter.desktop (rev 0)
+++ startcenter.desktop 2009-08-07 21:47:03 UTC (rev 49433)
@@ -0,0 +1,48 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+TryExec=ooffice
+Exec=openoffice.org3 %U
+Icon=startcenter
+Type=Application
+Categories=Office;X-SuSE-Core-Office;
+StartupNotify=false
+InitialPreference=5
+Name=OpenOffice.org 3.1
+Name[af]=OpenOffice.org 3.1
+Name[ar]=أوبن أفيس.أورج
+Name[be at latin]=OpenOffice.org 3.1
+Name[ca]=OpenOffice.org 3.1
+Name[cs]=OpenOffice.org 3.1
+Name[da]=OpenOffice.org 3.1
+Name[de]=OpenOffice.org 3.1
+Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི།
+Name[el]=OpenOffice.org 3.1
+Name[en_CA]=OpenOffice.org 3.1
+Name[en_GB]=OpenOffice.org 3.1
+Name[es]=OpenOffice.org 3.1
+Name[et]=OpenOffice.org 3.1
+Name[eu]=OpenOffice.org 3.1
+Name[fi]=OpenOffice.org 3.1
+Name[fr]=OpenOffice.org 3.1
+Name[gl]=OpenOffice.org 3.1
+Name[he]=OpenOffice.org 3.1
+Name[hu]=OpenOffice.org 3.1
+Name[it]=OpenOffice.org 3.1
+Name[ko]=OpenOffice.org 3.1
+Name[lt]=OpenOffice.org 3.1
+Name[nb]=OpenOffice.org 3.1
+Name[ne]=ओपनअफिस डट अर्ग
+Name[nl]=OpenOffice.org 3.1
+Name[oc]=OpenOffice.org 3.1
+Name[pl]=OpenOffice.org 3.1
+Name[ps]=اوپنافس.ورګ
+Name[pt]=OpenOffice.org 3.1
+Name[pt_BR]=OpenOffice.org 3.1
+Name[sl]=OpenOffice.org 3.1
+Name[sr]=OpenOffice.org 3.1
+Name[sr at latin]=OpenOffice.org 3.1
+Name[sv]=OpenOffice.org 3.1
+Name[vi]=OpenOffice.org 3.1
+Name[zh_CN]=OpenOffice.org 3.1
+GenericName=Office
Deleted: template.desktop
===================================================================
--- template.desktop 2009-08-07 21:28:41 UTC (rev 49432)
+++ template.desktop 2009-08-07 21:47:03 UTC (rev 49433)
@@ -1,50 +0,0 @@
-[Desktop Entry]
-Version=0.92
-Encoding=UTF-8
-MultipleArgs=false
-Terminal=0
-Icon=extension.png
-Exec=/opt/openoffice/program/soffice slot:5500
-Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
-Type=Application
-Name=OpenOffice.org 3.1 From Template
-Name[en]=OpenOffice.org 3.1 From Template
-Name[de]=OpenOffice.org 3.1 Aus Vorlage
-Name[pt]=OpenOffice.org 3.1 Aus Vorlage
-Name[ru]=OpenOffice.org 3.1 из шаблона...
-Name[el]=OpenOffice.org 3.1 Από πρότυπο
-Name[nl]=OpenOffice.org 3.1 Uit sjabloon
-Name[fr]=À partir d'un modèle OpenOffice.org 3.1
-Name[es]=A partir de una plantilla de OpenOffice.org 3.1
-Name[fi]=OpenOffice.org 3.1 Aus Vorlage
-Name[hu]=OpenOffice.org 3.1 sablonból
-Name[it]=OpenOffice.org 3.1 Da modello
-Name[cs]=Ze šablony OpenOffice.org 3.1
-Name[sk]=Zo šablóny OpenOffice.org 3.1
-Name[da]=OpenOffice.org 3.1 Fra skabelon
-Name[sv]=Från en OpenOffice.org 3.1-mall
-Name[pl]=OpenOffice.org 3.1 Na podstawie szablonu
-Name[pt_BR]=A partir de um modelo OpenOffice.org 3.1
-Name[ja]=OpenOffice.org 3.1 テンプレートから
-Name[ko]=OpenOffice.org 3.1 서식 파일로부터
-Name[zh_CN]=OpenOffice.org 3.1 采用样式
-Name[zh_TW]=OpenOffice.org 3.1 採用樣式
-Name[tr]=OpenOffice.org 3.1 Şablondan
-Name[ar]=OpenOffice.org 3.1 Aus Vorlage
-Name[he]=OpenOffice.org 3.1 Aus Vorlage
-Name[ca]=OpenOffice.org 3.1 Aus Vorlage
-Name[th]=OpenOffice.org 3.1 จากแม่แบบ
-Name[hi_IN]=OpenOffice.org 3.1 Aus Vorlage
-Name[et]=OpenOffice.org 3.1 mallist
-Name[sl]=OpenOffice.org 3.1 iz predloge
-Name[ns]=OpenOffice.org 3.1 go tšwa go Template
-Name[af]=OpenOffice.org 3.1 vanaf sjabloon
-Name[zu]=I-OpenOffice.org 3.1 esuka Oqwenjini lokuphumelelisa
-Name[nb]=OpenOffice.org 3.1 From Template
-Name[cy]=OpenOffice.org 3.1 From Template
-Name[tn]=OpenOffice.org 3.1 From Template
-Name[nn]=OpenOffice.org 3.1 From Template
-Name[eu]=OpenOffice.org 3.1 Aus Vorlage
-Name[lt]=„OpenOffice.org 3.1“ dokumentas iš šablono
-Name[kn_IN]=OpenOffice.org 3.1 ಸಿದ್ಧವಿನ್ಯಾಸ ಪುಟದಿಂದ
-Name[gl]=A partir dun modelo de OpenOffice.org 3.1
More information about the arch-commits
mailing list