diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2004-01-17 17:15:01 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2004-01-17 17:15:01 +0000 |
commit | 0522e024666e253027d96f07e81b8db37a60bde9 (patch) | |
tree | f691ad0b9ac3cacd58bda1cacbd0989d194a9c73 /app-office | |
parent | Version bumped. (Manifest recommit) (diff) | |
download | gentoo-2-0522e024666e253027d96f07e81b8db37a60bde9.tar.gz gentoo-2-0522e024666e253027d96f07e81b8db37a60bde9.tar.bz2 gentoo-2-0522e024666e253027d96f07e81b8db37a60bde9.zip |
bug fixes
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/openoffice-bin/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild | 17 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index d78283688e8d..3bb9ae5e7fb2 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/openoffice-bin -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.35 2003/11/14 16:51:58 brad_mssw Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.36 2004/01/17 17:15:01 suka Exp $ + + 17 Jan 2004; <suka@gentoo.org> openoffice-bin-1.1.0.ebuild: + Bug fixes for install and desktop entries (bug #32418) 14 Nov 2003; Brad House <brad_mssw@gentoo.org> openoffice-bin-1.1.0.ebuild: let openoffice-bin install on amd64 using compat libs diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild index b233b4c81f3a..9d76d5db1bd4 100644 --- a/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild,v 1.6 2003/11/18 10:37:29 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild,v 1.7 2004/01/17 17:15:01 suka Exp $ IUSE="kde gnome" -inherit virtualx - # NOTE: There are two big issues that should be addressed. # # 1) Language support and fonts should be addressed. @@ -87,10 +85,7 @@ src_install() { einfo "Installing OpenOffice.org into build root..." dodir ${INSTDIR} cd ${S} - # Setup virtualmake - export maketype="./setup" - # We need X to install... - virtualmake "-v -r:${T}/autoresponse" ||die "The setup program failed" + ./setup -nogui -v -r:${T}/autoresponse || die "The setup program failed" echo einfo "Removing build root from registry..." @@ -147,8 +142,9 @@ src_install() { # <brad@gentoo.org> (04 Aug 2003) for x in ${D}${INSTDIR}/share/gnome/net/ooo*.desktop do - # We have to handle setup differently + # We have to handle soffice and setup differently perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x} + perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x} # Now fix the rest perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x} doins ${x} @@ -169,8 +165,9 @@ src_install() { for x in ${kdeloc}/*.desktop do - # We have to handle setup differently + # We have to handle soffice and setup differently perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x} + perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x} # Now fix the rest perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x} doins ${x} |