[arch-commits] Commit in openoffice-base-beta/trunk (5 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Aug 2 11:50:57 UTC 2009
Date: Sunday, August 2, 2009 @ 07:50:57
Author: andyrtr
Revision: 48486
upgpkg: openoffice-base-beta 3.1.1_ooo310_m17-1
new snapshot ooo310_m17, backup sofficerc file for FS #15161; move all files to /usr/lib; drop templates menu entry, add startcenter menu entry
Added:
openoffice-base-beta/trunk/startcenter.desktop
Modified:
openoffice-base-beta/trunk/ChangeLog
openoffice-base-beta/trunk/PKGBUILD
openoffice-base-beta/trunk/openoffice.install
Deleted:
openoffice-base-beta/trunk/template.desktop
---------------------+
ChangeLog | 9 ++++++
PKGBUILD | 75 ++++++++++++++++++++++++++------------------------
openoffice.install | 4 +-
startcenter.desktop | 48 ++++++++++++++++++++++++++++++++
template.desktop | 50 ---------------------------------
5 files changed, 98 insertions(+), 88 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-08-02 10:38:02 UTC (rev 48485)
+++ ChangeLog 2009-08-02 11:50:57 UTC (rev 48486)
@@ -1,3 +1,12 @@
+2009-08-01 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.1-ooo310_m17-1 :
+ - new snapshot
+ - 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-04 Andreas Radke <andyrtr at archlinux.org>
* 3.1.1-ooo310_m15-1 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-08-02 10:38:02 UTC (rev 48485)
+++ PKGBUILD 2009-08-02 11:50:57 UTC (rev 48486)
@@ -2,16 +2,16 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-beta
-pkgver=3.1.1_ooo310_m15 # m9=RC1
+pkgver=3.1.1_ooo310_m17 # m9=RC1
pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-_OO_milestone=OOO310_m15
+_OO_milestone=OOO310_m17
license=('LGPL3')
url="http://www.openoffice.org"
install=openoffice.install
-depends=('curl>=7.19.2' 'hunspell>=1.2.8' 'python>=2.6.2' 'libwpd' 'redland'
- 'libxaw' 'neon>=0.28.4' 'dbus-glib' 'icu>=4.2.1' 'hsqldb-java' 'libxslt' 'desktop-file-utils')
+depends=('curl>=7.19.2' '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'
@@ -20,9 +20,10 @@
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-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost'
+backup=(usr/lib/openoffice-beta/program/sofficerc )
provides=('openoffice-base')
source=(${pkgname}-${_OO_milestone}.tar.gz
- template.desktop
+ startcenter.desktop
default-no-startup-wizard.diff
default-system-fpicker.diff
soffice-detect-mozilla-certificates.diff
@@ -184,43 +185,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
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
@@ -230,10 +233,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
@@ -248,17 +249,20 @@
chown root.root -R ${pkgdir}/
chmod +rX -R ${pkgdir}/usr
+
## Develize it for BETA!
- cd ${pkgdir}/opt/
+ cd ${pkgdir}/usr/lib/
mv openoffice openoffice-beta
- sed -i -e 's|Exec=/opt/openoffice/program|Exec=/opt/openoffice-beta/program|g' ${pkgdir}/usr/share/applications/*.desktop
+ sed -i -e 's|Exec=/usr/bin/soffice|Exec=/usr/bin/soffice-beta|g' ${pkgdir}/usr/share/applications/*.desktop
+ sed -i -e 's|Exec=/usr/bin/spadmin|Exec=/usr/bin/spadmin-beta|g' ${pkgdir}/usr/share/applications/printeradmin.desktop
+
cd ${pkgdir}/usr/bin
rm -f soffice spadmin
- ln -sf ../../opt/openoffice-beta/program/soffice soffice-beta
- ln -sf ../../opt/openoffice-beta/program/spadmin spadmin-beta
+ ln -sf /usr/lib/openoffice-beta/program/soffice soffice-beta
+ ln -sf /usr/lib/openoffice-beta/program/spadmin spadmin-beta
+
cd ${pkgdir}/usr/share/applications/
-
for desktopz in *.desktop
do mv $desktopz Beta-$desktopz
done
@@ -267,11 +271,10 @@
cd ${pkgdir}/usr/share/applications/
sed -i -e 's|Icon=|Icon=beta-|g' ${pkgdir}/usr/share/applications/*.desktop
- sed -i -e 's|OpenOffice\.org\ 3\.1|OpenOffice\.org\ beta|g' ${pkgdir}/usr/share/applications/*.desktop
- sed -i -e 's|\/opt\/openoffice\-beta\/program\/soffice|\/usr\/bin\/soffice\-beta|g' ${pkgdir}/usr/share/applications/*.desktop
+ sed -i -e 's|OpenOffice\.org\ 3\.1|OpenOffice\.org\ Beta|g' ${pkgdir}/usr/share/applications/*.desktop
- cd ${pkgdir}/opt/openoffice-beta/program/
- ln -sf /opt/openoffice-beta/program/soffice.bin soffice-beta.bin
+ cd ${pkgdir}/usr/lib/openoffice-beta/program/
+ ln -sf /usr/lib/openoffice-beta/program/soffice.bin soffice-beta.bin
# set desktop variable to force gtk/gnome vcl usage
install -m755 -d ${pkgdir}/etc/profile.d
@@ -280,6 +283,6 @@
# link the mozilla-plugin
mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
cd ${pkgdir}/usr/lib/mozilla/plugins/
- ln -v -s /opt/openoffice-beta/program/libnpsoplugin.so .
+ ln -v -s /usr/lib/openoffice-beta/program/libnpsoplugin.so .
mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-beta.so
}
Modified: openoffice.install
===================================================================
--- openoffice.install 2009-08-02 10:38:02 UTC (rev 48485)
+++ openoffice.install 2009-08-02 11:50:57 UTC (rev 48486)
@@ -6,7 +6,7 @@
echo " * relogin or source /etc/profile.d/openoffice-beta.sh"
echo " * see http://wiki.archlinux.org/index.php/Openoffice"
echo " how to use extensions, e.g. for spell checking"
-echo " see /opt/openoffice-beta/share/extension/install what"
+echo " see /usr/lib/openoffice-beta/share/extension/install what"
echo " is shipped with this package"
echo " * make sure you have installed a ttf font (ttf-dejavu recommended)"
}
@@ -21,6 +21,6 @@
# make sure everything is gone, maybe someone has installed
# extensions for all users using unopkg --shared
-rm -rf /opt/openoffice-beta
+rm -rf /usr/lib/openoffice-beta
}
Added: startcenter.desktop
===================================================================
--- startcenter.desktop (rev 0)
+++ startcenter.desktop 2009-08-02 11:50:57 UTC (rev 48486)
@@ -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-02 10:38:02 UTC (rev 48485)
+++ template.desktop 2009-08-02 11:50:57 UTC (rev 48486)
@@ -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 beta From Template
-Name[en]=OpenOffice.org beta From Template
-Name[de]=OpenOffice.org beta Aus Vorlage
-Name[pt]=OpenOffice.org beta Aus Vorlage
-Name[ru]=OpenOffice.org beta из шаблона...
-Name[el]=OpenOffice.org beta Από πρότυπο
-Name[nl]=OpenOffice.org beta Uit sjabloon
-Name[fr]=À partir d'un modèle OpenOffice.org beta
-Name[es]=A partir de una plantilla de OpenOffice.org beta
-Name[fi]=OpenOffice.org beta Aus Vorlage
-Name[hu]=OpenOffice.org beta sablonból
-Name[it]=OpenOffice.org beta Da modello
-Name[cs]=Ze šablony OpenOffice.org beta
-Name[sk]=Zo šablóny OpenOffice.org beta
-Name[da]=OpenOffice.org beta Fra skabelon
-Name[sv]=Från en OpenOffice.org beta-mall
-Name[pl]=OpenOffice.org beta Na podstawie szablonu
-Name[pt_BR]=A partir de um modelo OpenOffice.org beta
-Name[ja]=OpenOffice.org beta テンプレートから
-Name[ko]=OpenOffice.org beta 서식 파일로부터
-Name[zh_CN]=OpenOffice.org beta 采用样式
-Name[zh_TW]=OpenOffice.org beta 採用樣式
-Name[tr]=OpenOffice.org beta Şablondan
-Name[ar]=OpenOffice.org beta Aus Vorlage
-Name[he]=OpenOffice.org beta Aus Vorlage
-Name[ca]=OpenOffice.org beta Aus Vorlage
-Name[th]=OpenOffice.org beta จากแม่แบบ
-Name[hi_IN]=OpenOffice.org beta Aus Vorlage
-Name[et]=OpenOffice.org beta mallist
-Name[sl]=OpenOffice.org beta iz predloge
-Name[ns]=OpenOffice.org beta go tšwa go Template
-Name[af]=OpenOffice.org beta vanaf sjabloon
-Name[zu]=I-OpenOffice.org beta esuka Oqwenjini lokuphumelelisa
-Name[nb]=OpenOffice.org beta From Template
-Name[cy]=OpenOffice.org beta From Template
-Name[tn]=OpenOffice.org beta From Template
-Name[nn]=OpenOffice.org beta From Template
-Name[eu]=OpenOffice.org beta Aus Vorlage
-Name[lt]=„OpenOffice.org beta“ dokumentas iš šablono
-Name[kn_IN]=OpenOffice.org beta ಸಿದ್ಧವಿನ್ಯಾಸ ಪುಟದಿಂದ
-Name[gl]=A partir dun modelo de OpenOffice.org beta
More information about the arch-commits
mailing list