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

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Sep 8 07:52:53 UTC 2008


    Date: Monday, September 8, 2008 @ 03:52:52
  Author: andyrtr
Revision: 12046

upgpkg: openoffice-base-beta 3.0_ooo300_m5-2
    fix menu entries and ship dictionaries

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

--------------------+
 ChangeLog          |    5 +++++
 PKGBUILD           |   22 ++++++++++------------
 openoffice.install |   23 +++++++++++++----------
 3 files changed, 28 insertions(+), 22 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-09-08 02:49:28 UTC (rev 12045)
+++ ChangeLog	2008-09-08 07:52:52 UTC (rev 12046)
@@ -1,3 +1,8 @@
+openoffice-base-beta 3.0-ooo300_m5-2
+- fixes desktop menu entries+icons
+- enable build of all dictionaries
+- deploy all built dicts in post.install
+
 openoffice-base-beta 3.0-ooo300_m5-1
 - next snapshot
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-08 02:49:28 UTC (rev 12045)
+++ PKGBUILD	2008-09-08 07:52:52 UTC (rev 12046)
@@ -3,7 +3,7 @@
 
 pkgname=openoffice-base-beta
 pkgver=3.0_ooo300_m5 # =RC1
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 #_OO_milestone=ooo300-m5
@@ -108,6 +108,7 @@
 	--prefix=/usr --exec-prefix=/usr\
 	--disable-ldap\
 	--with-lang="en-US"\
+	--with-dict=ALL\
 	--disable-gnome-vfs\
 	--disable-binfilter\
 	--disable-odk\
@@ -147,10 +148,8 @@
 	--with-system-zlib\
 	--with-system-openssl\
 	--without-fonts\
-	--without-myspell-dicts\
 	--without-afms\
 	--without-gpc\
-	--without-myspell-dicts\
 	--without-nas\
 	--without-stlport\
 	--with-jdk-home=${JAVA_HOME} \
@@ -167,6 +166,7 @@
 	 $EXTRAOPTS || return 1
 
 #	--disable-qadevooo\
+#	--without-myspell-dicts\
 
 	cd ..
 
@@ -215,10 +215,15 @@
 	ln -s ../../opt/openoffice/program/soffice soffice
 	ln -s ../../opt/openoffice/program/spadmin spadmin
 
+	# install more dictionaries from source tree
+	for i in `ls -1 ${srcdir}/src/dictionaries/unxlngx6.pro/bin/dict-??.oxt`; do
+	  install -Dm644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i
+	done
+
 	# install shortcuts
 	mv ${pkgdir}/opt/openoffice/share/xdg/*.desktop  ${pkgdir}/usr/share/applications
 	cd ${pkgdir}/usr/share/applications
-	sed -i -e 's|Exec=openoffice.org3.0|Exec=/opt/openoffice/program/soffice|g' *.desktop
+	sed -i -e 's|Exec=openoffice.org3|Exec=/opt/openoffice/program/soffice|g' *.desktop
 	sed -i -e 's|Exec=/opt/openoffice/program/soffice-printeradmin|Exec=/opt/openoffice/program/spadmin|g' printeradmin.desktop
 	# fix exec commands in shortcuts for Xfce menu
 	sed -i -e 's|base %U|base|g' base.desktop
@@ -230,7 +235,7 @@
 	# remove quickstarter, we disabled it above
 	rm -rf ${pkgdir}/usr/share/applications/qstart.desktop
 	# fix icons in shortcuts
-	sed -i -e 's|Icon=openofficeorg30-|Icon=|g' *.desktop
+	sed -i -e 's|Icon=openofficeorg3-|Icon=|g' *.desktop
 	# add template desktop file
 	install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop
 
@@ -258,12 +263,6 @@
 	rm -f  ${pkgdir}/opt/openoffice/program/root*.dat
 	rm -f  ${pkgdir}/opt/openoffice/program/root*.dat.*
 
- 	# fix font wizard not installed by default (from http://qa.openoffice.org/issues/show_bug.cgi?id=81102)
-	install -D -m644 ${srcdir}/FontOOo_1.7.1.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/FontOOo.sxw
-
-	# add missing spell wizard
-	install -D -m644 ${srcdir}/dictionaries/diclst/DicOOo.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/DicOOo.sxw
-
 	# link the mozilla-plugin
 	mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
 	cd ${pkgdir}/usr/lib/mozilla/plugins/
@@ -294,5 +293,4 @@
 	mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-beta.so
 	cd ${pkgdir}/opt/openoffice-beta/program/
 	ln -sf /opt/openoffice-beta/program/soffice.bin soffice-beta.bin
-	
 }

Modified: openoffice.install
===================================================================
--- openoffice.install	2008-09-08 02:49:28 UTC (rev 12045)
+++ openoffice.install	2008-09-08 07:52:52 UTC (rev 12046)
@@ -3,20 +3,23 @@
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 
-echo " NOTE:"
-echo " This package has been built with java support."
-echo " If you want java features for runtime, you can either use: "
-echo " 1. OpenJDK6"
-echo " 2. Sun's JRE."
-echo " you will need it for \"help\" section and some java based wizards"
-echo " for further reading: http://wiki.services.openoffice.org/wiki/Java_and_OpenOffice.org"
-echo " "
 echo " >>KDE integration is no longer supported!<<"
-echo " "
+echo " ----------------------------------------------------"
 echo " Please preset Gnome appearance always with"
 echo " \"export OOO_FORCE_DESKTOP=gnome\" even when"
 echo " you are runnning a different desktop!"
-echo " or put it in /etc/profile, rc.local, or ~/.bashrc."
+echo " or put it in /etc/profile, rc.local, or ~/.bashrc"
+echo " ----------------------------------------------------"
+echo " see http://wiki.archlinux.org/index.php/Openoffice"
+echo " how to use extensions now for spell checking"
+echo " see extension manager what is shipped in the package"
+echo " ----------------------------------------------------"
+echo -ne " deploying dictionaries now" 
+for i in `ls -1 /opt/openoffice-beta/share/extension/install/dict-??.oxt`; do
+  echo -n "."
+  /opt/openoffice-beta/program/unopkg add --shared --force $i &> /dev/null
+done
+echo " "
 }
 
 post_upgrade() {




More information about the arch-commits mailing list