[arch-commits] Commit in openoffice-base-beta/trunk (4 files)

[andyrtr at archlinux.org]

    Date: Thursday, September 18, 2008 @ 03:16:32
  Author: andyrtr
Revision: 12675

upgpkg: openoffice-base-beta 3.0_ooo300_m6-1

Added:
  openoffice-base-beta/trunk/buildfix_dict_parallel.diff
Modified:
  openoffice-base-beta/trunk/ChangeLog
  openoffice-base-beta/trunk/PKGBUILD
  openoffice-base-beta/trunk/openoffice.install

-----------------------------+
 ChangeLog                   |    2 ++
 PKGBUILD                    |   10 +++++++---
 buildfix_dict_parallel.diff |   20 ++++++++++++++++++++
 openoffice.install          |    3 ++-
 4 files changed, 31 insertions(+), 4 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-09-18 04:08:07 UTC (rev 12674)
+++ ChangeLog	2008-09-18 07:16:32 UTC (rev 12675)
@@ -4,6 +4,8 @@
 - make dict deployement invisible
 - fix build with new openjdk6 with rhino
 - make sure /opt is clean after pkg removement
+- fix http://qa.openoffice.org/issues/show_bug.cgi?id=93391
+  took a diff against dev300_m31
 
 openoffice-base-beta 3.0-ooo300_m5-2
 - fixes desktop menu entries+icons

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-18 04:08:07 UTC (rev 12674)
+++ PKGBUILD	2008-09-18 07:16:32 UTC (rev 12675)
@@ -2,7 +2,7 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-beta
-pkgver=3.0_ooo300_m6 # =RC1
+pkgver=3.0_ooo300_m6 # m5=RC1
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
@@ -31,7 +31,8 @@
 	buildfix-gcc43.diff
 	shell.patch
 	system_hsqldb.diff
-	buildfix-openjdk-6-no-rhino.diff)
+	buildfix-openjdk-6-no-rhino.diff
+	buildfix_dict_parallel.diff)
 options=('!distcc' '!ccache' '!makeflags')
 md5sums=('e3684b9314e4aaafe2b5edf23701d874'
          'a247ba577007d8169201bd8f41cf41b5'
@@ -42,7 +43,8 @@
          'bf7119084a2d1e0566b5e34b57dce8eb'
          'a51200f770c635355c430cc5052db8cf'
          '4addae44d20bb2b247e429d88b66a4c1'
-         '4fe2810b40358b0e7dc2df3d056bde7a')
+         '4fe2810b40358b0e7dc2df3d056bde7a'
+         '991b4a9dac2e6b84c45fa6f0494dd41a')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
@@ -75,6 +77,8 @@
 	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
 	patch -Np0 -i ${srcdir}/system_hsqldb.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix-openjdk-6-no-rhino.diff || return 1
+	 # http://qa.openoffice.org/issues/show_bug.cgi?id=93391
+	patch -Np0 -i ${srcdir}/buildfix_dict_parallel.diff || return 1
 
 	# allows xmlsec to be able to read the format of the digital certificates.
 	patch -Np0 -i ${srcdir}/libxmlsec-findcerts.diff || return 1

Added: buildfix_dict_parallel.diff
===================================================================
--- buildfix_dict_parallel.diff	                        (rev 0)
+++ buildfix_dict_parallel.diff	2008-09-18 07:16:32 UTC (rev 12675)
@@ -0,0 +1,20 @@
+--- dictionaries/prj/build.lst	2008-08-15 10:41:08.000000000 +0000
++++ dictionaries/prj/build.lst.new	2008-09-17 16:11:22.000000000 +0000
+@@ -4,10 +4,10 @@
+ di      dictionaries\cs_CZ      nmake   -       all     di_cs_CZ NULL
+ di      dictionaries\da_DK      nmake   -       all     di_da_DK NULL
+ di      dictionaries\de_AT      nmake   -       all     di_de_AT NULL
+-di      dictionaries\de_CH      nmake   -       all     di_de_CH NULL
++di      dictionaries\de_CH      nmake   -       all     di_de_CH di_de_AT NULL
+ di      dictionaries\de_DE      nmake   -       all     di_de_DE di_de_AT di_de_CH NULL
+ di      dictionaries\en_US      nmake   -       all     di_en_US NULL
+-di      dictionaries\en_ZA      nmake   -       all     di_en_ZA NULL
++di      dictionaries\en_ZA      nmake   -       all     di_en_ZA di_en_US NULL
+ di      dictionaries\en_GB      nmake   -       all     di_en_GB di_en_US di_en_ZA NULL
+ di      dictionaries\es_ES      nmake   -       all     di_es_ES NULL
+ di      dictionaries\et_EE      nmake   -       all     di_et_EE NULL
+@@ -28,3 +28,4 @@
+ di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ NULL
+ di      dictionaries\vi         nmake   -       all     di_vi NULL
+ di      dictionaries\zu_ZA      nmake   -       all     di_zu_ZA NULL
++

Modified: openoffice.install
===================================================================
--- openoffice.install	2008-09-18 04:08:07 UTC (rev 12674)
+++ openoffice.install	2008-09-18 07:16:32 UTC (rev 12675)
@@ -8,11 +8,12 @@
 echo " Please preset Gnome appearance always with"
 echo " \"export OOO_FORCE_DESKTOP=gnome\" even when"
 echo " you are runnning a different desktop!"
-echo " or put it in /etc/profile, rc.local, or ~/.bashrc"
+echo " or put it in /etc/profile, ~/.bashrc or ~/.xprofile"
 echo " ----------------------------------------------------"
 echo " see http://wiki.archlinux.org/index.php/Openoffice"
 echo " how to use extensions now for spell checking"
 echo " see extension manager what is shipped in the package"
+echo " openoffice-spell-* packages are no longer required"
 echo " ----------------------------------------------------"
 for i in `ls -1 /opt/openoffice-beta/share/extension/install/dict-??.oxt`; do
   /opt/openoffice-beta/program/unopkg add --shared --force $i &> /dev/null