[arch-commits] Commit in openoffice-base-devel/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Aug 5 22:08:32 UTC 2009
Date: Wednesday, August 5, 2009 @ 18:08:32
Author: andyrtr
Revision: 49296
Merged revisions 45455,49295 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/openoffice-base-devel/trunk
........
r45455 | andyrtr | 2009-07-11 20:53:54 +0000 (Sa, 11 Jul 2009) | 2 lines
upgpkg: openoffice-base-devel 3.2_dev300_m52-1
new snapshot dev300_m52
........
r49295 | andyrtr | 2009-08-05 22:07:52 +0000 (Mi, 05 Aug 2009) | 2 lines
upgpkg: openoffice-base-devel 3.2_dev300_m54-1
new snapshot dev300_m54, backup sofficerc file for FS #15161; move all files to /usr/lib; drop templates menu entry, add startcenter menu entry
........
Added:
openoffice-base-devel/repos/extra-x86_64/startcenter.desktop
(from rev 49295, openoffice-base-devel/trunk/startcenter.desktop)
Modified:
openoffice-base-devel/repos/extra-x86_64/ (properties)
openoffice-base-devel/repos/extra-x86_64/ChangeLog
openoffice-base-devel/repos/extra-x86_64/PKGBUILD
openoffice-base-devel/repos/extra-x86_64/openoffice.install
Deleted:
openoffice-base-devel/repos/extra-x86_64/template.desktop
---------------------+
ChangeLog | 10 +++++
PKGBUILD | 97 +++++++++++++++++++++++++++-----------------------
openoffice.install | 12 +++---
startcenter.desktop | 48 ++++++++++++++++++++++++
template.desktop | 50 -------------------------
5 files changed, 118 insertions(+), 99 deletions(-)
Property changes on: openoffice-base-devel/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /openoffice-base-devel/trunk:1-45441
+ /openoffice-base-devel/trunk:1-49295
Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2009-08-05 22:07:52 UTC (rev 49295)
+++ extra-x86_64/ChangeLog 2009-08-05 22:08:32 UTC (rev 49296)
@@ -1,3 +1,13 @@
+2009-08-05 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.2_dev300_m54-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
+ - minor changes to the install file
+
2009-07-11 Andreas Radke <andyrtr at archlinux.org>
* 3.2_dev300_m52-1:
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-08-05 22:07:52 UTC (rev 49295)
+++ extra-x86_64/PKGBUILD 2009-08-05 22:08:32 UTC (rev 49296)
@@ -2,37 +2,48 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-devel
-pkgver=3.2_dev300_m52
+pkgver=3.2_dev300_m54
pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=('i686' 'x86_64')
-_OO_milestone=DEV300_m52
+_OO_milestone=DEV300_m54
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" '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" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils')
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
'gconf: adds additional gnome support'
'nss: adds support for signed files/macros'
'pstoedit: translates PostScript and PDF graphics into other vector formats'
'poppler: for shipped pdfimport extension')
-makedepends=('bison' 'subversion' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
- 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1-2"
- 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.5-4") # 'boost'
+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' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.5-5") # 'boost'
+backup=(usr/lib/openoffice-dev/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
buildfix-gcc43.diff
shell.patch
- system_hsqldb.diff
buildfix_FormulaMissingHeader.diff
openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
+md5sums=('8b98ffb24a6ff673c4076381c84df4e5'
+ '63209bbc64c901ef105455bda0282f45'
+ '71f136a31e296a04ab68932a31dd533e'
+ '6c596129fb48316226ce3adfd3a4c86d'
+ '1dc7480a04f572ad136d35923a2af66d'
+ 'bf7119084a2d1e0566b5e34b57dce8eb'
+ 'a51200f770c635355c430cc5052db8cf'
+ '863a3ab2c17a3d11b8fa3ec321986366'
+ '75c7e5dd7cf4c266f48565fb6425f8c4'
+ '8d68d44c941a687813ddd968383cdf27')
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
@@ -65,7 +76,7 @@
patch -Np1 -i ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch || return 1
# allows soffice to find the user's firefox profile so that it can read
- # his digital certificates. Nss stores digital certificates in your mozilla firefox profile.
+ # its digital certificates. Nss stores digital certificates in your mozilla firefox profile.
patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
# important bugfixes
@@ -185,46 +196,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.2/ || return 1
cd basis3.2 || 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.2/ openoffice.org3/ || return 1
cd openoffice.org3/ || return 1
rm basis-link && mv basis3.2 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
- if [ "$CARCH" = "x86_64" ]; then
- pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlngx6.pro/bin
- else pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlngi6.pro/bin
- fi
+ 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
@@ -234,10 +244,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
@@ -253,16 +261,18 @@
chmod +rX -R ${pkgdir}/usr
## Develize it!
- cd ${pkgdir}/opt/
+ cd ${pkgdir}/usr/lib/
mv openoffice openoffice-dev
- sed -i -e 's|Exec=/opt/openoffice/program|Exec=/opt/openoffice-dev/program|g' ${pkgdir}/usr/share/applications/*.desktop || return 1
+ sed -i -e 's|Exec=/usr/bin/soffice|Exec=/usr/bin/soffice-dev|g' ${pkgdir}/usr/share/applications/*.desktop
+ sed -i -e 's|Exec=/usr/bin/spadmin|Exec=/usr/bin/spadmin-dev|g' ${pkgdir}/usr/share/applications/printeradmin.desktop
+
cd ${pkgdir}/usr/bin
rm -f soffice spadmin
- ln -sf ../../opt/openoffice-dev/program/soffice soffice-dev
- ln -sf ../../opt/openoffice-dev/program/spadmin spadmin-dev
+ ln -sf /usr/lib/openoffice-dev/program/soffice soffice-dev
+ ln -sf /usr/lib/openoffice-dev/program/spadmin spadmin-dev
+
cd ${pkgdir}/usr/share/applications/
-
for desktopz in *.desktop
do mv $desktopz Dev-$desktopz
done
@@ -270,12 +280,11 @@
for i in `find ${pkgdir}/usr/share/icons -name '*.png'` ; do mv $i `dirname $i`/dev-`basename $i` ; done ;
cd ${pkgdir}/usr/share/applications/
- sed -i -e 's|Icon=|Icon=dev-|g' $startdir/pkg/usr/share/applications/*.desktop || return 1
+ sed -i -e 's|Icon=|Icon=dev-|g' ${pkgdir}/usr/share/applications/*.desktop || return 1
sed -i -e 's|OpenOffice\.org\ 3\.2|OpenOffice\.org\ devel|g' ${pkgdir}/usr/share/applications/*.desktop || return 1
- sed -i -e 's|\/opt\/openoffice\-dev\/program\/soffice|\/usr\/bin\/soffice\-dev|g' ${pkgdir}/usr/share/applications/*.desktop || return 1
- cd ${pkgdir}/opt/openoffice-dev/program/
- ln -sf /opt/openoffice-dev/program/soffice.bin soffice-dev.bin
+ cd ${pkgdir}/usr/lib/openoffice-dev/program/
+ ln -sf /usr/lib/openoffice-dev/program/soffice.bin soffice-dev.bin
# set desktop variable to force gtk/gnome vcl usage
install -m755 -d ${pkgdir}/etc/profile.d
@@ -284,6 +293,6 @@
# link the mozilla-plugin
mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
cd ${pkgdir}/usr/lib/mozilla/plugins/
- ln -v -s /opt/openoffice-dev/program/libnpsoplugin.so .
+ ln -v -s /usr/lib/openoffice-dev/program/libnpsoplugin.so .
mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-dev.so
}
Modified: extra-x86_64/openoffice.install
===================================================================
--- extra-x86_64/openoffice.install 2009-08-05 22:07:52 UTC (rev 49295)
+++ extra-x86_64/openoffice.install 2009-08-05 22:08:32 UTC (rev 49296)
@@ -3,10 +3,12 @@
gtk-update-icon-cache -f -q /usr/share/icons/hicolor
update-desktop-database -q
-echo " see http://wiki.archlinux.org/index.php/Openoffice"
-echo " how to use extensions, e.g. for spell checking"
-echo " see /opt/openoffice-dev/share/extension/install what"
-echo " is shipped with this package"
+echo " * relogin or source /etc/profile.d/openoffice-devel.sh"
+echo " * see http://wiki.archlinux.org/index.php/Openoffice"
+echo " how to use extensions, e.g. for spell checking"
+echo " see /usr/lib/openoffice-dev/share/extension/install what"
+echo " is shipped with this package"
+echo " * make sure you have installed a ttf font (ttf-dejavu recommended)"
}
post_upgrade() {
@@ -19,5 +21,5 @@
# make sure everything is gone, maybe someone has installed
# extensions for all users using unopkg --shared
-rm -rf /opt/openoffice-dev
+rm -rf /usr/lib/openoffice-dev
}
Copied: openoffice-base-devel/repos/extra-x86_64/startcenter.desktop (from rev 49295, openoffice-base-devel/trunk/startcenter.desktop)
===================================================================
--- extra-x86_64/startcenter.desktop (rev 0)
+++ extra-x86_64/startcenter.desktop 2009-08-05 22:08:32 UTC (rev 49296)
@@ -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.2
+Name[af]=OpenOffice.org 3.2
+Name[ar]=أوبن أفيس.أورج
+Name[be at latin]=OpenOffice.org 3.2
+Name[ca]=OpenOffice.org 3.2
+Name[cs]=OpenOffice.org 3.2
+Name[da]=OpenOffice.org 3.2
+Name[de]=OpenOffice.org 3.2
+Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི།
+Name[el]=OpenOffice.org 3.2
+Name[en_CA]=OpenOffice.org 3.2
+Name[en_GB]=OpenOffice.org 3.2
+Name[es]=OpenOffice.org 3.2
+Name[et]=OpenOffice.org 3.2
+Name[eu]=OpenOffice.org 3.2
+Name[fi]=OpenOffice.org 3.2
+Name[fr]=OpenOffice.org 3.2
+Name[gl]=OpenOffice.org 3.2
+Name[he]=OpenOffice.org 3.2
+Name[hu]=OpenOffice.org 3.2
+Name[it]=OpenOffice.org 3.2
+Name[ko]=OpenOffice.org 3.2
+Name[lt]=OpenOffice.org 3.2
+Name[nb]=OpenOffice.org 3.2
+Name[ne]=ओपनअफिस डट अर्ग
+Name[nl]=OpenOffice.org 3.2
+Name[oc]=OpenOffice.org 3.2
+Name[pl]=OpenOffice.org 3.2
+Name[ps]=اوپنافس.ورګ
+Name[pt]=OpenOffice.org 3.2
+Name[pt_BR]=OpenOffice.org 3.2
+Name[sl]=OpenOffice.org 3.2
+Name[sr]=OpenOffice.org 3.2
+Name[sr at latin]=OpenOffice.org 3.2
+Name[sv]=OpenOffice.org 3.2
+Name[vi]=OpenOffice.org 3.2
+Name[zh_CN]=OpenOffice.org 3.2
+GenericName=Office
Deleted: extra-x86_64/template.desktop
===================================================================
--- extra-x86_64/template.desktop 2009-08-05 22:07:52 UTC (rev 49295)
+++ extra-x86_64/template.desktop 2009-08-05 22:08:32 UTC (rev 49296)
@@ -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 devel From Template
-Name[en]=OpenOffice.org devel From Template
-Name[de]=OpenOffice.org devel Aus Vorlage
-Name[pt]=OpenOffice.org devel Aus Vorlage
-Name[ru]=OpenOffice.org devel из шаблона...
-Name[el]=OpenOffice.org devel Από πρότυπο
-Name[nl]=OpenOffice.org devel Uit sjabloon
-Name[fr]=À partir d'un modèle OpenOffice.org devel
-Name[es]=A partir de una plantilla de OpenOffice.org devel
-Name[fi]=OpenOffice.org devel Aus Vorlage
-Name[hu]=OpenOffice.org devel sablonból
-Name[it]=OpenOffice.org devel Da modello
-Name[cs]=Ze šablony OpenOffice.org devel
-Name[sk]=Zo šablóny OpenOffice.org devel
-Name[da]=OpenOffice.org devel Fra skabelon
-Name[sv]=Från en OpenOffice.org devel-mall
-Name[pl]=OpenOffice.org devel Na podstawie szablonu
-Name[pt_BR]=A partir de um modelo OpenOffice.org devel
-Name[ja]=OpenOffice.org devel テンプレートから
-Name[ko]=OpenOffice.org devel 서식 파일로부터
-Name[zh_CN]=OpenOffice.org devel 采用样式
-Name[zh_TW]=OpenOffice.org devel 採用樣式
-Name[tr]=OpenOffice.org devel Şablondan
-Name[ar]=OpenOffice.org devel Aus Vorlage
-Name[he]=OpenOffice.org devel Aus Vorlage
-Name[ca]=OpenOffice.org devel Aus Vorlage
-Name[th]=OpenOffice.org devel จากแม่แบบ
-Name[hi_IN]=OpenOffice.org devel Aus Vorlage
-Name[et]=OpenOffice.org devel mallist
-Name[sl]=OpenOffice.org devel iz predloge
-Name[ns]=OpenOffice.org devel go tšwa go Template
-Name[af]=OpenOffice.org devel vanaf sjabloon
-Name[zu]=I-OpenOffice.org devel esuka Oqwenjini lokuphumelelisa
-Name[nb]=OpenOffice.org devel From Template
-Name[cy]=OpenOffice.org devel From Template
-Name[tn]=OpenOffice.org devel From Template
-Name[nn]=OpenOffice.org devel From Template
-Name[eu]=OpenOffice.org devel Aus Vorlage
-Name[lt]=„OpenOffice.org devel“ dokumentas iš šablono
-Name[kn_IN]=OpenOffice.org devel ಸಿದ್ಧವಿನ್ಯಾಸ ಪುಟದಿಂದ
-Name[gl]=A partir dun modelo de OpenOffice.org devel
More information about the arch-commits
mailing list