Date: Tuesday, January 19, 2010 @ 00:05:25
Author: andyrtr
Revision: 63942
upgpkg: openoffice-base-beta 3.2.0_ooo320_m10-1
new version 3.2.0_ooo320_m9
Modified:
openoffice-base-beta/trunk/ChangeLog
openoffice-base-beta/trunk/PKGBUILD
-----------+
ChangeLog | 7 +++++++
PKGBUILD | 23 ++++++++++++++---------
2 files changed, 21 insertions(+), 9 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-01-19 05:00:32 UTC (rev 63941)
+++ ChangeLog 2010-01-19 05:05:25 UTC (rev 63942)
@@ -1,3 +1,10 @@
+2010-01-18 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.2.0-OOO320_m10-1 :
+ - new snapshot/3.2.0 RC3
+ - fix version number in menu
+ - create tarball in its own function
+
2010-01-14 Andreas Radke <andyrtr at archlinux.org>
* 3.2.0-OOO320_m9-1 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-19 05:00:32 UTC (rev 63941)
+++ PKGBUILD 2010-01-19 05:05:25 UTC (rev 63942)
@@ -4,7 +4,7 @@
pkgbase="openoffice-base-beta"
pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m9
+_OO_milestone=OOO320_m10
pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m9=3.2.0 RC2
pkgrel=1
arch=('i686' 'x86_64')
@@ -13,9 +13,9 @@
makedepends=(# the real makedeps
'bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs'
'libart-lgpl' 'libxtst'
'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
"xulrunner>=1.9.1.6"
- 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler'
'pstoedit' 'gconf' "openjdk6>=1.6.2"
+ 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler'
'kdelibs' 'pstoedit' 'gconf' "openjdk6>=1.6.2"
# from main OOo the deps
- "curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd'
'redland' 'libxaw' "neon>=0.28.4"
+ "curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd'
'redland>=1.0.10' 'libxaw' "neon>=0.28.4"
'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt'
'hicolor-icon-theme' 'desktop-file-utils'
'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve'
'libmspack' 'libldap' 'lucene' 'boost>=1.41.0')
# libmythes
@@ -31,14 +31,19 @@
openoffice-beta.profile)
options=('!distcc' '!ccache' '!makeflags')
-build() {
- cd ${srcdir}
+# source PKGBUILD && mksource
+mksource() {
+ mkdir /tmp/$pkgname-source
+ pushd /tmp/$pkgname-source
# now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
-# svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
-# find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
-# tar -cvzf ${SRCDEST}/${pkgname}-${_OO_milestone}.tar.gz
${_OO_milestone}/*
-# return 1
+ svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
+ find . -type d -depth -name ".svn" -exec rm -rf {} \;
+ tar -cvzf ${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
+ popd
+}
+build() {
+
cd ${srcdir}/${_OO_milestone}
# just to make sure that it will detect the desired JDK/JVM - we want
openjdk6
