[Lunar-commits] r23913 - in moonbase/trunk: x11-apps/openoffice-bin zbeta/openoffice-src

[Moritz Heiber]

Author: moe
Date: 2007-04-04 12:27:41 +0200 (Wed, 04 Apr 2007)
New Revision: 23913

Modified:
   moonbase/trunk/x11-apps/openoffice-bin/DETAILS
   moonbase/trunk/zbeta/openoffice-src/BUILD
   moonbase/trunk/zbeta/openoffice-src/DETAILS
   moonbase/trunk/zbeta/openoffice-src/PRE_BUILD
Log:
Openoffice 2.2.0 .. yay me



Modified: moonbase/trunk/x11-apps/openoffice-bin/DETAILS
===================================================================
--- moonbase/trunk/x11-apps/openoffice-bin/DETAILS	2007-04-04 07:52:10 UTC (rev 23912)
+++ moonbase/trunk/x11-apps/openoffice-bin/DETAILS	2007-04-04 10:27:41 UTC (rev 23913)
@@ -1,15 +1,15 @@
           MODULE=openoffice-bin
-         VERSION=2.1.0 
+         VERSION=2.2.0 
           SOURCE=OOo_${VERSION}_LinuxIntel_install_en-US.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOE680_m6_native_packed-1_en-US.9095
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOF680_m14_native_packed-1_en-US.9134
    SOURCE_URL[0]=http://ftp.ussg.iu.edu/openoffice/stable/$VERSION/
    SOURCE_URL[1]=http://mirrors.sunsite.dk/openoffice/stable/$VERSION/
    SOURCE_URL[2]=http://niihau.student.utwente.nl/openoffice/stable/$VERSION/
    SOURCE_URL[3]=ftp://ftp.funet.fi/pub/mirrors/openoffice.org/stable/$VERSION/
-      SOURCE_VFY=sha1:6de6a83d402817ef5116d28072f9dd6b0600c6d6
+      SOURCE_VFY=sha1:a2a04de16ab3bd9290178312339d5117f4511010
         WEB_SITE=http://www.openoffice.org/
          ENTERED=20020704
-         UPDATED=20070208
+         UPDATED=20070404
            SHORT="The open office suite for unix"
        LDD_CHECK=off
          ARCHIVE=off

Modified: moonbase/trunk/zbeta/openoffice-src/BUILD
===================================================================
--- moonbase/trunk/zbeta/openoffice-src/BUILD	2007-04-04 07:52:10 UTC (rev 23912)
+++ moonbase/trunk/zbeta/openoffice-src/BUILD	2007-04-04 10:27:41 UTC (rev 23913)
@@ -33,15 +33,12 @@
   # Apply mandatory and optional patches
 
   patch_it $SOURCE2 0 &&
+  patch_it $SOURCE6 0 &&
 
-  if ! module_installed Linux-PAM ; then
-    patch_it $SOURCE3 0;
-  fi &&
-
   # As long as OOo-src does not compile against nss it needs its own mozilla
   # tarball (and it also compiles its own mozilla)
   mkdir -p $SOURCE_DIRECTORY/moz/download &&
-  cp $SOURCE_CACHE/$SOURCE4 $SOURCE_DIRECTORY/moz/download/ &&
+  cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&
 
   cd $SOURCE_DIRECTORY/config_office &&
 
@@ -55,8 +52,8 @@
   cd $SOURCE_DIRECTORY &&
 
   ./bootstrap &&
-  sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxIntelEnv.Set.sh &&
-  source LinuxIntelEnv.Set.sh &&
+  sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxX86Env.Set.sh &&
+  source LinuxX86Env.Set.sh &&
   dmake &&
 
   prepare_install &&
@@ -66,7 +63,7 @@
   cd instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/opt &&
 
   rm -rf $OO_DIR &&
-  cp -rv openoffice.org2.1 $OO_DIR &&
+  cp -rv openoffice.org2.2 $OO_DIR &&
 
   # Install icons for the .desktop files
   mkdir -p -m0755 /usr/share/icons/{HighContrast,hicolor} &&

Modified: moonbase/trunk/zbeta/openoffice-src/DETAILS
===================================================================
--- moonbase/trunk/zbeta/openoffice-src/DETAILS	2007-04-04 07:52:10 UTC (rev 23912)
+++ moonbase/trunk/zbeta/openoffice-src/DETAILS	2007-04-04 10:27:41 UTC (rev 23913)
@@ -1,27 +1,27 @@
           MODULE=openoffice-src
-         VERSION=2.1.0
-          SOURCE=OOo_${VERSION}_src.tar.bz2
+         VERSION=2.2.0
+          SOURCE=OOo_${VERSION}_src_core.tar.bz2
          SOURCE2=$MODULE-$VERSION-xauth.patch
-         SOURCE3=$MODULE-$VERSION-withoutpam.patch
-         SOURCE4=mozilla-source-1.7.5.tar.gz
-         SOURCE5=OOo_${VERSION}_src_l10n.tar.bz2
-         SOURCE6=OOo_${VERSION}_src_system.tar.bz2
+         SOURCE3=mozilla-source-1.7.5.tar.gz
+         SOURCE4=OOo_${VERSION}_src_l10n.tar.bz2
+         SOURCE5=OOo_${VERSION}_src_system.tar.bz2
+         SOURCE6=$MODULE-$VERSION-mozilla-cplusplus.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOE680_m6
       SOURCE_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE2_URL=$PATCH_URL/
-     SOURCE3_URL=$PATCH_URL/
-     SOURCE4_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/
+     SOURCE3_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/
+     SOURCE4_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
-     SOURCE6_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
+     SOURCE6_URL=$PATCH_URL/
       SOURCE_VFY=sha1:9513216ae71267addf3625f5a41c3a43564da3bc
      SOURCE2_VFY=sha1:cf93a6119e9c991facc208ba34896ed88571946c
-     SOURCE3_VFY=sha1:78f0970aeb0c2c87ff1ccbf9cf6aec4967840558
-     SOURCE4_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
-     SOURCE5_VFY=sha1:dd50756610e277f2886f6d423d57c084f0bee18a
-     SOURCE6_VFY=sha1:77e97d1ed8eb3276e36ac54e4e021f703e40a587
+     SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
+     SOURCE4_VFY=sha1:dd50756610e277f2886f6d423d57c084f0bee18a
+     SOURCE5_VFY=sha1:77e97d1ed8eb3276e36ac54e4e021f703e40a587
+     SOURCE6_VFY=sha1:31ee26c90f43f4385a713a8ee64a9ed0801e61d8
         WEB_SITE=http://www.openoffice.org
          ENTERED=20030805
-         UPDATED=20070210
+         UPDATED=20070404
            PSAFE=no
            SHORT="OpenOffice.org Office Suite"
 cat << EOF

Modified: moonbase/trunk/zbeta/openoffice-src/PRE_BUILD
===================================================================
--- moonbase/trunk/zbeta/openoffice-src/PRE_BUILD	2007-04-04 07:52:10 UTC (rev 23912)
+++ moonbase/trunk/zbeta/openoffice-src/PRE_BUILD	2007-04-04 10:27:41 UTC (rev 23913)
@@ -2,5 +2,5 @@
 
 cd $SOURCE_DIRECTORY &&
 
-tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE6 --strip-components=1
+tar xf $SOURCE_CACHE/$SOURCE4 --strip-components=1 &&
+tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1