From b3f4d13e7facbd946126d54a0e36213c66494ee2 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Sat, 21 Feb 2009 14:17:02 +0000
Subject: [PATCH] =?UTF-8?q?Anpassung=20an=20neue=20Archiv=20Versionen.=20O?=
 =?UTF-8?q?xygen=20gibts=20leider=20nicht=20mehr=20mit=2064=20Bit,=20daf?=
 =?UTF-8?q?=C3=BCr=20aber=20OpenOffice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V961/ViitorMake@4543 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/xsys/OpenOffice   | 9 +++++++--
 SysBuild/xsys/OxygenOffice | 9 ++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SysBuild/xsys/OpenOffice b/SysBuild/xsys/OpenOffice
index 6d0acb9..cf234f0 100644
--- a/SysBuild/xsys/OpenOffice
+++ b/SysBuild/xsys/OpenOffice
@@ -75,9 +75,14 @@ SRCPATH=X11_2/Office
 
 premk() {
 	cd $MAKEDIR
-	tar -zxvf $LFSSOURCE/$SRCPATH/OOo*.tar.gz
+	if [ "$MK64BIT" == "true" ]; then
+		tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_LinuxX86-64_install_wJRE_de.tar.gz
+		VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_LinuxX86-64_install_wJRE_de.tar.gz|awk -F "_" '{print $2}'`
+	else
+		tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_LinuxIntel_install_wJRE_de.tar.gz
+		VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_LinuxIntel_install_wJRE_de.tar.gz|awk -F "_" '{print $2}'`
+	fi
 	cd OOG*
-	VERSION=`ls $LFSSOURCE/$SRCPATH/OOo*.tar.gz|awk -F "_" '{print $3}'`
 	DSTPKGNAME=OpenOffice-$VERSION
 	PKGNAME=$DSTPKGNAME.tbz
 }
diff --git a/SysBuild/xsys/OxygenOffice b/SysBuild/xsys/OxygenOffice
index 5235c78..d91345d 100644
--- a/SysBuild/xsys/OxygenOffice
+++ b/SysBuild/xsys/OxygenOffice
@@ -75,13 +75,8 @@ SRCPATH=X11_2/Office
 
 premk() {
 	cd $TMPROOT
-	if [ ${MK64BIT} == "true" ]; then
-		tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_unxlngx6_install_de_rpm_64bit.tar.gz
-		VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_unxlngx6_install_de_rpm_64bit.tar.gz|awk -F "_" '{print $3}'`
-	else
-		tar -zxvf $LFSSOURCE/$SRCPATH/OOO_*_LinuxIntel_install_de.tar.gz
-		VERSION=`ls $LFSSOURCE/$SRCPATH/OOO_*_LinuxIntel_install_de.tar.gz|awk -F "_" '{print $3}'`
-	fi
+	tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_[0-9][0-9][0-9][0-9][0-9][0-9]_LinuxIntel_install_de.tar.gz
+	VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_[0-9][0-9][0-9][0-9][0-9][0-9]_LinuxIntel_install_de.tar.gz|awk -F "_" '{print $2}'`
 	DSTPKGNAME=OxygenOffice-$VERSION
 	PKGNAME=$DSTPKGNAME.tbz
 }