Date: Monday, January 25, 2010 @ 09:58:41
Author: andyrtr
Revision: 65232
upgpkg: openoffice-base-devel 3.3_dev300_m70-1
new version DEV300_m70
Modified:
openoffice-base-devel/trunk/ChangeLog
openoffice-base-devel/trunk/PKGBUILD
-----------+
ChangeLog | 6 ++++++
PKGBUILD | 23 +++++++++++------------
2 files changed, 17 insertions(+), 12 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-01-25 13:12:35 UTC (rev 65231)
+++ ChangeLog 2010-01-25 14:58:41 UTC (rev 65232)
@@ -1,3 +1,9 @@
+2010-01-25 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.3_dev300_m70-1:
+ - new snapshot
+ - create tarball in its own function
+
2010-01-22 Andreas Radke <andyrtr at archlinux.org>
* 3.3_dev300_m69-2:
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-25 13:12:35 UTC (rev 65231)
+++ PKGBUILD 2010-01-25 14:58:41 UTC (rev 65232)
@@ -4,9 +4,9 @@
pkgbase="openoffice-base-devel"
pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m69
+_OO_milestone=DEV300_m70
pkgver=3.3_${_OO_milestone/DEV/dev}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.openoffice.org";
@@ -27,20 +27,21 @@
soffice-detect-mozilla-certificates.diff
buildfix-gcc44.diff
buildfix_FormulaMissingHeader.diff
-
http://www.openoffice.org/nonav/issues/showattachment.cgi/67089/canvas.build-breaks-in-cairocanvas.patch
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for
upstream build instructions
-build() {
- # now mercurial
http://wiki.services.openoffice.org/wiki/Mercurial_Pilot and
http://wiki.services.openoffice.org/wiki/OOo_and_Mercurial
-# mkdir -p ${srcdir}/${_OO_milestone}
-# cd ${srcdir}
-# hg -v clone -r ${_OO_milestone}
http://hg.services.openoffice.org/hg/DEV300 ${srcdir}/${_OO_milestone}
-# tar -cvzf ${SRCDEST}/${pkgname}-${_OO_milestone}.tar.gz
${_OO_milestone}/*
-# return 1
+# source PKGBUILD && mksource
+mksource() {
+ mkdir /tmp/$pkgname-source
+ pushd /tmp/$pkgname-source
+ hg -v clone -r ${_OO_milestone}
http://hg.services.openoffice.org/hg/DEV300 ${_OO_milestone}
+ 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
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
@@ -60,8 +61,6 @@
# build fixes
patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
- # http://www.openoffice.org/issues/show_bug.cgi?id=108160
- patch -Np1 -i ${srcdir}/canvas.build-breaks-in-cairocanvas.patch ||
return 1
# allows soffice to find the user's firefox profile so that it can read
# its digital certificates. Nss stores digital certificates in your
mozilla firefox profile.
