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

[andyrtr at archlinux.org]

    Date: Saturday, October 31, 2009 @ 13:29:59
  Author: andyrtr
Revision: 57470

new snapshot DEV320_m2

Modified:
  openoffice-base-beta/trunk/ChangeLog
  openoffice-base-beta/trunk/PKGBUILD
  openoffice-base-beta/trunk/openoffice-beta.profile
  openoffice-base-beta/trunk/openoffice.install

-------------------------+
 ChangeLog               |   11 ++++++++++-
 PKGBUILD                |   34 ++++++++++++++--------------------
 openoffice-beta.profile |    1 +
 openoffice.install      |    2 +-
 4 files changed, 26 insertions(+), 22 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-10-31 17:00:10 UTC (rev 57469)
+++ ChangeLog	2009-10-31 17:29:59 UTC (rev 57470)
@@ -1,5 +1,14 @@
-	- TODO: fix extensions installation!
+2009-10-31 Andreas Radke <andyrtr at archlinux.org>
 
+        * 3.2.0-OOO320_m2-1 :
+	- new snapshot
+	- add KDE4 support to the profile file + install msg
+	- install all built extensions
+	# sun-report-builder.oxt and
+	# wiki-publisher.oxt installation is still broken
+	- link unopkg
+
+
 2009-10-17 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2.0-OOO320_m2-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-31 17:00:10 UTC (rev 57469)
+++ PKGBUILD	2009-10-31 17:29:59 UTC (rev 57470)
@@ -4,8 +4,8 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m2
-pkgver=3.2.0_${_OO_milestone/OOO/ooo} # =3.2.0 BETA
+_OO_milestone=OOO320_m3
+pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m2=3.2.0 BETA
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -31,22 +31,7 @@
 	buildfix_system_db48.diff
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('229b6f368e623c7d45c20eca0d04515d'
-         'e3a0b76dcd876f3d721ee7183729153d'
-         '90897451b6cfed490e481f06d45408aa'
-         '71f136a31e296a04ab68932a31dd533e'
-         '6c596129fb48316226ce3adfd3a4c86d'
-         '1dc7480a04f572ad136d35923a2af66d'
-         'c8e82b4d2324fe62ad8c6e29213e80b5'
-         '863a3ab2c17a3d11b8fa3ec321986366'
-         '0cd6f3525939d3ef6e5a30ad30c25d27'
-         '8d68d44c941a687813ddd968383cdf27')
 
-# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
-
-## TODO: installation of extensions, see http://cvs.fedora.redhat.com/viewvc/rpms/openoffice.org/devel/openoffice.org.spec?revision=1.2021&view=markup
-
-
 build() {
 	cd ${srcdir}
 	# now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
@@ -105,7 +90,6 @@
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 	unset CFLAGS
 	unset CXXFLAGS
-#	export ARCH_FLAGS="$CFLAGS"
 
 	# Need to recreate the configure script because of patches
 	autoreconf -v || return 1
@@ -237,7 +221,16 @@
 	  install -D -m644 $i ${pkgdir}/usr/lib/openoffice/share/extension/install/$i || return 1
 	done
 	popd
-
+	
+	# install extensions
+       pushd ${srcdir}/${_OO_milestone}/solver/320/unxlng?6.pro/bin
+         install -D -m644 sun-report-builder.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt || return 1
+	 install -D -m644 swext/wiki-publisher.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/wiki-publisher.oxt || return 1
+	 install -D -m644 minimizer/sun-presentation-minimizer.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/sun-presentation-minimizer.oxt || return 1
+	 install -D -m644 presenter/presenter-screen.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/presenter-screen.oxt || return 1
+	 install -D -m644 pdfimport/pdfimport.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/pdfimport.oxt || return 1
+       popd
+	
 	# prepare filesystem entries
 	mkdir -p ${pkgdir}/usr/{bin,share/applications}
 	mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
@@ -287,7 +280,8 @@
 	rm -f soffice spadmin
 	ln -sf /usr/lib/openoffice-beta/program/soffice soffice-beta
 	ln -sf /usr/lib/openoffice-beta/program/spadmin spadmin-beta
-
+	ln -sf /usr/lib/openoffice-beta/program/unopkg unopkg-beta
+	
 	cd ${pkgdir}/usr/share/applications/
 	for desktopz in *.desktop
 	   do mv $desktopz Beta-$desktopz

Modified: openoffice-beta.profile
===================================================================
--- openoffice-beta.profile	2009-10-31 17:00:10 UTC (rev 57469)
+++ openoffice-beta.profile	2009-10-31 17:29:59 UTC (rev 57470)
@@ -1 +1,2 @@
 export OOO_FORCE_DESKTOP=gnome
+#export OOO_FORCE_DESKTOP=KDE4
\ No newline at end of file

Modified: openoffice.install
===================================================================
--- openoffice.install	2009-10-31 17:00:10 UTC (rev 57469)
+++ openoffice.install	2009-10-31 17:29:59 UTC (rev 57470)
@@ -3,7 +3,7 @@
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 
-echo " * relogin or source /etc/profile.d/openoffice-beta.sh"
+echo " * check /etc/profile.d/openoffice-beta.sh, then relogin or \"source\" the file"
 echo " * see http://wiki.archlinux.org/index.php/Openoffice"
 echo "   how to use extensions, e.g. for spell checking"
 echo "   see /usr/lib/openoffice-beta/share/extension/install what"