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

[andyrtr at archlinux.org]

    Date: Tuesday, January 13, 2009 @ 01:22:39
  Author: andyrtr
Revision: 24090

Merged revisions 22214,24088 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk

........
  r22214 | andyrtr | 2008-12-23 07:46:36 +0000 (Di, 23 Dez 2008) | 1 line
  
  fix post.install msg for correct path
........
  r24088 | andyrtr | 2009-01-13 05:53:30 +0000 (Di, 13 Jan 2009) | 2 lines
  
  upgpkg: openoffice-base-beta 3.0.1_ooo300_m15-1
      new version 3.0.1rc2, change stlport to match SUN builds
........

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/openoffice.install

--------------------+
 ChangeLog          |    6 ++++++
 PKGBUILD           |   12 ++++++------
 openoffice.install |   11 ++++++-----
 3 files changed, 18 insertions(+), 11 deletions(-)


Property changes on: openoffice-base-beta/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-22022
   + /openoffice-base-beta/trunk:1-24089

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-01-13 05:54:07 UTC (rev 24089)
+++ extra-i686/ChangeLog	2009-01-13 06:22:39 UTC (rev 24090)
@@ -1,3 +1,9 @@
+openoffice-base-beta 3.0.1-ooo300_m15-1
+- next snapshot = 3.0.1rc2
+- modify install msg
+- build with stlport for i686 and
+  without for x86_64
+
 openoffice-base-beta 3.0.1-ooo300_m14-1
 - 3.0.1rc1
 - fix high cpu load in file dialog FS #11710

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-13 05:54:07 UTC (rev 24089)
+++ extra-i686/PKGBUILD	2009-01-13 06:22:39 UTC (rev 24090)
@@ -2,12 +2,12 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-beta
-pkgver=3.0.1_ooo300_m14 # m14=RC1
+pkgver=3.0.1_ooo300_m15 # m15=RC2
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-#_OO_milestone=ooo300-m14
-_OO_milestone=OOO300_m14
+#_OO_milestone=ooo300-m15
+_OO_milestone=OOO300_m15
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
@@ -36,7 +36,7 @@
 	http://www.openoffice.org/nonav/issues/showattachment.cgi/58937/workspace.fpicker8.patch
 	http://www.openoffice.org/nonav/issues/showattachment.cgi/56152/run_fpicker_in_main.patch)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('e0499e259482320650bc30b302ad6e67'
+md5sums=('b2d77f8cbdbb5d0c5b79770c2ea7f844'
          'a247ba577007d8169201bd8f41cf41b5'
          '71f136a31e296a04ab68932a31dd533e'
          '6c596129fb48316226ce3adfd3a4c86d'
@@ -50,7 +50,6 @@
          '4d91aaa94f9e702e184ab1ce99287a73'
          'c835885b68a5f3ff18b74c53d9b0bea3')
 
-
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
 build() {
@@ -102,10 +101,11 @@
 	patch -Np0 -i ${srcdir}/default-system-fpicker.diff || return 1
 
 	if [ "$CARCH" = "x86_64" ]; then
-          EXTRAOPTS="--with-stlport"
+          EXTRAOPTS="--without-stlport"
           # fix to build with SUN jdk/jre and OpenJDK
           # http://qa.openoffice.org/issues/show_bug.cgi?id=74749
 	  sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/solenv/inc/libs.mk || return 1
+	 else EXTRAOPTS="--with-stlport"
 	fi
 
 	cd ${srcdir}/config_office

Modified: extra-i686/openoffice.install
===================================================================
--- extra-i686/openoffice.install	2009-01-13 05:54:07 UTC (rev 24089)
+++ extra-i686/openoffice.install	2009-01-13 06:22:39 UTC (rev 24090)
@@ -3,10 +3,11 @@
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 
-echo " see http://wiki.archlinux.org/index.php/Openoffice"
-echo " how to use extensions, e.g. for spell checking"
-echo " see /opt/openoffice/share/extension/install what"
-echo " is shipped with this package"
+echo " * relogin or source /etc/profile.d/openoffice-beta.sh"
+echo " * see http://wiki.archlinux.org/index.php/Openoffice"
+echo "   how to use extensions, e.g. for spell checking"
+echo "   see /opt/openoffice-beta/share/extension/install what"
+echo "   is shipped with this package"
 }
 
 post_upgrade() {
@@ -19,6 +20,6 @@
 
 # make sure everything is gone, maybe someone has installed
 # extensions for all users using unopkg --shared
-rm -rf /opt/openoffice
+rm -rf /opt/openoffice-beta
 }