Date: Tuesday, January 19, 2010 @ 00:06:23
Author: andyrtr
Revision: 63944
Merged revisions 63186,63942 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk
........
r63186 | andyrtr | 2010-01-15 20:23:26 +0100 (Fr, 15 Jan 2010) | 1 line
fix version number in menu entry
........
r63942 | andyrtr | 2010-01-19 06:05:25 +0100 (Di, 19 Jan 2010) | 2 lines
upgpkg: openoffice-base-beta 3.2.0_ooo320_m10-1
new version 3.2.0_ooo320_m9
........
Modified:
openoffice-base-beta/repos/extra-i686/ (properties)
openoffice-base-beta/repos/extra-i686/ChangeLog
openoffice-base-beta/repos/extra-i686/PKGBUILD
openoffice-base-beta/repos/extra-i686/startcenter.desktop
---------------------+
ChangeLog | 7 +++++
PKGBUILD | 23 ++++++++++-------
startcenter.desktop | 66 +++++++++++++++++++++++++-------------------------
3 files changed, 54 insertions(+), 42 deletions(-)
Property changes on: openoffice-base-beta/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /openoffice-base-beta/trunk:1-63066
+ /openoffice-base-beta/trunk:1-63942
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2010-01-19 05:06:17 UTC (rev 63943)
+++ extra-i686/ChangeLog 2010-01-19 05:06:23 UTC (rev 63944)
@@ -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: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-01-19 05:06:17 UTC (rev 63943)
+++ extra-i686/PKGBUILD 2010-01-19 05:06:23 UTC (rev 63944)
@@ -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
Modified: extra-i686/startcenter.desktop
===================================================================
--- extra-i686/startcenter.desktop 2010-01-19 05:06:17 UTC (rev 63943)
+++ extra-i686/startcenter.desktop 2010-01-19 05:06:23 UTC (rev 63944)
@@ -8,41 +8,41 @@
Categories=Office;X-SuSE-Core-Office;
StartupNotify=false
InitialPreference=5
-Name=OpenOffice.org 3.1
-Name[af]=OpenOffice.org 3.1
+Name=OpenOffice.org 3.2
+Name[af]=OpenOffice.org 3.2
Name[ar]=أوبن أفيس.أورج
-name...@latin]=openoffice.org 3.1
-Name[ca]=OpenOffice.org 3.1
-Name[cs]=OpenOffice.org 3.1
-Name[da]=OpenOffice.org 3.1
-Name[de]=OpenOffice.org 3.1
+name...@latin]=openoffice.org 3.2
+Name[ca]=OpenOffice.org 3.2
+Name[cs]=OpenOffice.org 3.2
+Name[da]=OpenOffice.org 3.2
+Name[de]=OpenOffice.org 3.2
Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི།
-Name[el]=OpenOffice.org 3.1
-Name[en_CA]=OpenOffice.org 3.1
-Name[en_GB]=OpenOffice.org 3.1
-Name[es]=OpenOffice.org 3.1
-Name[et]=OpenOffice.org 3.1
-Name[eu]=OpenOffice.org 3.1
-Name[fi]=OpenOffice.org 3.1
-Name[fr]=OpenOffice.org 3.1
-Name[gl]=OpenOffice.org 3.1
-Name[he]=OpenOffice.org 3.1
-Name[hu]=OpenOffice.org 3.1
-Name[it]=OpenOffice.org 3.1
-Name[ko]=OpenOffice.org 3.1
-Name[lt]=OpenOffice.org 3.1
-Name[nb]=OpenOffice.org 3.1
+Name[el]=OpenOffice.org 3.2
+Name[en_CA]=OpenOffice.org 3.2
+Name[en_GB]=OpenOffice.org 3.2
+Name[es]=OpenOffice.org 3.2
+Name[et]=OpenOffice.org 3.2
+Name[eu]=OpenOffice.org 3.2
+Name[fi]=OpenOffice.org 3.2
+Name[fr]=OpenOffice.org 3.2
+Name[gl]=OpenOffice.org 3.2
+Name[he]=OpenOffice.org 3.2
+Name[hu]=OpenOffice.org 3.2
+Name[it]=OpenOffice.org 3.2
+Name[ko]=OpenOffice.org 3.2
+Name[lt]=OpenOffice.org 3.2
+Name[nb]=OpenOffice.org 3.2
Name[ne]=ओपनअफिस डट अर्ग
-Name[nl]=OpenOffice.org 3.1
-Name[oc]=OpenOffice.org 3.1
-Name[pl]=OpenOffice.org 3.1
+Name[nl]=OpenOffice.org 3.2
+Name[oc]=OpenOffice.org 3.2
+Name[pl]=OpenOffice.org 3.2
Name[ps]=اوپنافس.ورګ
-Name[pt]=OpenOffice.org 3.1
-Name[pt_BR]=OpenOffice.org 3.1
-Name[sl]=OpenOffice.org 3.1
-Name[sr]=OpenOffice.org 3.1
-name...@latin]=openoffice.org 3.1
-Name[sv]=OpenOffice.org 3.1
-Name[vi]=OpenOffice.org 3.1
-Name[zh_CN]=OpenOffice.org 3.1
+Name[pt]=OpenOffice.org 3.2
+Name[pt_BR]=OpenOffice.org 3.2
+Name[sl]=OpenOffice.org 3.2
+Name[sr]=OpenOffice.org 3.2
+name...@latin]=openoffice.org 3.2
+Name[sv]=OpenOffice.org 3.2
+Name[vi]=OpenOffice.org 3.2
+Name[zh_CN]=OpenOffice.org 3.2
GenericName=Office
