[arch-commits] Commit in openoffice-base/trunk (PKGBUILD buildfix_dict_parallel.diff)

[andyrtr at archlinux.org]

    Date: Sunday, September 21, 2008 @ 06:48:03
  Author: andyrtr
Revision: 12811

built RC2, should be final one, removed one unneeded patch

Modified:
  openoffice-base/trunk/PKGBUILD
Deleted:
  openoffice-base/trunk/buildfix_dict_parallel.diff

-----------------------------+
 PKGBUILD                    |   18 +++++++-----------
 buildfix_dict_parallel.diff |   20 --------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-21 06:48:18 UTC (rev 12810)
+++ PKGBUILD	2008-09-21 10:48:03 UTC (rev 12811)
@@ -3,10 +3,10 @@
 
 pkgname=openoffice-base
 pkgver=3.0.0
-pkgrel=0.1
+pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-_OO_milestone=OOO300_m6  # m5=RC1
+_OO_milestone=OOO300_m7  # =RC2
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
@@ -29,10 +29,9 @@
 	buildfix-gcc43.diff
 	shell.patch
 	system_hsqldb.diff
-	buildfix-openjdk-6-no-rhino.diff
-	buildfix_dict_parallel.diff)
+	buildfix-openjdk-6-no-rhino.diff)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('9c0980a5c6eebe6a08e1241af6448259'
+md5sums=('434b74cdba08f2a027d2b8ea249afdec'
          'ae7e00eff06bc2921d9ff184ff48556e'
          '71f136a31e296a04ab68932a31dd533e'
          '6c596129fb48316226ce3adfd3a4c86d'
@@ -41,16 +40,15 @@
          'bf7119084a2d1e0566b5e34b57dce8eb'
          'a51200f770c635355c430cc5052db8cf'
          '4addae44d20bb2b247e429d88b66a4c1'
-         '4fe2810b40358b0e7dc2df3d056bde7a'
-         '991b4a9dac2e6b84c45fa6f0494dd41a')
+         '4fe2810b40358b0e7dc2df3d056bde7a')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
 build() {
 #	mkdir ${srcdir}/${_OO_milestone}
 #	cd ${srcdir}/${_OO_milestone}
-#	export _MILESTONE=${_OO_milestone}
-#	export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
+	export _MILESTONE=${_OO_milestone}
+	export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
 	# checkout snapshot
 #	cvs -q -z9 co -r $_MILESTONE OpenOffice3
 	# fetch missing modules
@@ -76,8 +74,6 @@
 	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

Deleted: buildfix_dict_parallel.diff
===================================================================
--- buildfix_dict_parallel.diff	2008-09-21 06:48:18 UTC (rev 12810)
+++ buildfix_dict_parallel.diff	2008-09-21 10:48:03 UTC (rev 12811)
@@ -1,20 +0,0 @@
---- 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
-+