diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-09-18 05:53:51 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-09-18 05:53:51 +0000 |
| commit | 1835b430090930e02dc3091ee9d7488b50fff4df (patch) | |
| tree | c4fc3343521a7458d4dbde58387d119143cc6fa2 | |
| parent | Version bump to 0.80. Adjusted dependency on pilot-link for 0.72.1 to fix bug... (diff) | |
| download | gentoo-2-1835b430090930e02dc3091ee9d7488b50fff4df.tar.gz gentoo-2-1835b430090930e02dc3091ee9d7488b50fff4df.tar.bz2 gentoo-2-1835b430090930e02dc3091ee9d7488b50fff4df.zip | |
Fix wrapper on AMD64 see bug #192833
(Portage version: 2.1.3.9)
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice-bin/files/wrapper.in | 2 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index aeee918445af..855eabc6986c 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.173 2007/09/17 11:57:59 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.174 2007/09/18 05:53:50 suka Exp $ + + 18 Sep 2007; Andreas Proschofsky <suka@gentoo.org> files/wrapper.in, + openoffice-bin-2.3.0.ebuild: + Fix wrapper on AMD64 see bug #192833 *openoffice-bin-2.3.0 (17 Sep 2007) diff --git a/app-office/openoffice-bin/files/wrapper.in b/app-office/openoffice-bin/files/wrapper.in index b0dd900679f1..364b2af8d8c1 100644 --- a/app-office/openoffice-bin/files/wrapper.in +++ b/app-office/openoffice-bin/files/wrapper.in @@ -1,4 +1,4 @@ #!/bin/sh export OOO_EXTRA_ARG='' unset PYTHONPATH -/usr/lib/openoffice/program/soffice "$@" +/usr/LIBDIR/openoffice/program/soffice "$@" diff --git a/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild b/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild index 93aafdcdb05e..3264932a2084 100644 --- a/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild,v 1.1 2007/09/17 11:57:59 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild,v 1.2 2007/09/18 05:53:50 suka Exp $ inherit eutils fdo-mime rpm multilib @@ -110,6 +110,7 @@ src_install () { # Install wrapper script newbin ${FILESDIR}/wrapper.in ooffice + sed -i -e s/LIBDIR/$(get_libdir)/g ${D}/usr/bin/ooffice || die # Component symlinks for app in base calc draw impress math writer; do @@ -140,7 +141,7 @@ pkg_postinst() { eselect oodict update --libdir $(get_libdir) - [[ -x /sbin/chpax ]] && [[ -e /usr/lib/openoffice/program/soffice.bin ]] && chpax -zm /usr/lib/openoffice/program/soffice.bin + [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin elog " To start OpenOffice.org, run:" elog |