[arch-commits] Commit in libreoffice/trunk (PKGBUILD libreoffice.install)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Dec 24 12:30:02 UTC 2010


    Date: Friday, December 24, 2010 @ 07:30:01
  Author: andyrtr
Revision: 103947

fix dictionarries splitting; fix sdk location; modify install msg for pkg split; fix #22204; switch to new LibO url

Modified:
  libreoffice/trunk/PKGBUILD
  libreoffice/trunk/libreoffice.install

---------------------+
 PKGBUILD            |   25 +++++++++++++++----------
 libreoffice.install |   16 ++++++++++------
 2 files changed, 25 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-24 10:01:36 UTC (rev 103946)
+++ PKGBUILD	2010-12-24 12:30:01 UTC (rev 103947)
@@ -13,7 +13,7 @@
 _LO_tree="3.3"
 _OFFICEUPD="330"
 license=('LGPL3')
-url="http://www.freedesktop.org/wiki/Software/LibreOffice"
+url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'boost' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java'
              'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'openjdk6' 'cppunit'
@@ -107,7 +107,6 @@
 	${_additional_source_url}/831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
 	${_additional_source_url}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 	${_additional_source_url}/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
-	${_additional_source_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	http://www.numbertext.org/linux/c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
 	http://download.go-oo.org/src/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
 	http://download.go-oo.org/src/debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
@@ -124,6 +123,7 @@
 	http://ftp.fsf.hu/OpenOffice.org_hu/numbertext/numbertext-0.9.3.oxt
 	http://ftp.fsf.hu/OpenOffice.org_hu/hunart/hunart-0.3.oxt
 	http://ftp.fsf.hu/OpenOffice.org_hu/typo/typo-0.3.oxt
+	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	http://download.go-oo.org/src/ConvertTextToNumber-1.3.2.oxt
 	http://ftp.devall.hu/kami/go-oo/WatchWindow_1.2.0.0.oxt
 	http://ftp.devall.hu/kami/go-oo/Diagram_1.1.0.0.oxt
@@ -226,7 +226,6 @@
          '831126a1ee5af269923cfab6050769fe'
          '067201ea8b126597670b5eff72e1f66c'
          'cf8a6967f7de535ae257fa411c98eb88'
-         '90401bca927835b6fbae4a707ed187c8'
          'c8fc33ad1efb77155f61e0e4ba8d3e9e'
          '47e1edaa44269bc537ae8cabebb0f638'
          'debc62758716a169df9f62e6ab2bc634'
@@ -243,6 +242,7 @@
          'a90f17aaccfb38be917732503740e6a2'
          'b632bdd25649cc4067bcb410bae23d2b'
          '2b3fcb8d061dbfc26bf7efbcfa6d7ae2'
+         '90401bca927835b6fbae4a707ed187c8'
          '451ccf439a36a568653b024534669971'
          '23bd75552206dfcd8fd4e29137dcac84'
          '41c9b65ad60af4b3255bbecdfef11736'
@@ -419,19 +419,24 @@
 
 	# move SDK to separated package
 	mkdir -p ${srcdir}/sdk-install/usr/lib/ooo-3.3/basis3.3/sdk
-	mv ${pkgdir}/usr/lib/ooo-3.3/basis3.3/sdk ${srcdir}/sdk-install/usr/lib/ooo-3.3/basis3.3/sdk
+#	mv ${pkgdir}/usr/lib/ooo-3.3/basis3.3/sdk ${srcdir}/sdk-install/usr/lib/ooo-3.3/basis3.3/sdk
+	mv ${pkgdir}/usr/lib/ooo-3.3/basis3.3/sdk ${srcdir}/sdk-install/usr/lib/ooo-3.3/basis3.3/
 
 	mkdir -p ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/sdk
-	mv ${pkgdir}/usr/share/doc/packages/libreoffice/sdk ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/sdk
+#	mv ${pkgdir}/usr/share/doc/packages/libreoffice/sdk ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/sdk
+	mv ${pkgdir}/usr/share/doc/packages/libreoffice/sdk ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/
 
 	mkdir -p ${srcdir}/sdk-install/usr/share/ooo-3.3/sdk
-	mv ${pkgdir}/usr/share/ooo-3.3/sdk ${srcdir}/sdk-install/usr/share/ooo-3.3/sdk
+#	mv ${pkgdir}/usr/share/ooo-3.3/sdk ${srcdir}/sdk-install/usr/share/ooo-3.3/sdk
+	mv ${pkgdir}/usr/share/ooo-3.3/sdk ${srcdir}/sdk-install/usr/share/ooo-3.3/
 
 	mkdir -p ${srcdir}/sdk-install/usr/share/idl/ooo-3.3
-	mv ${pkgdir}/usr/share/idl/ooo-3.3 ${srcdir}/sdk-install/usr/share/idl/ooo-3.3
+#	mv ${pkgdir}/usr/share/idl/ooo-3.3 ${srcdir}/sdk-install/usr/share/idl/ooo-3.3
+	mv ${pkgdir}/usr/share/idl/ooo-3.3 ${srcdir}/sdk-install/usr/share/idl/
 
 	mkdir -p ${srcdir}/sdk-install/usr/include/ooo-3.3
-	mv ${pkgdir}/usr/include/ooo-3.3 ${srcdir}/sdk-install/usr/include/ooo-3.3
+#	mv ${pkgdir}/usr/include/ooo-3.3 ${srcdir}/sdk-install/usr/include/ooo-3.3
+	mv ${pkgdir}/usr/include/ooo-3.3 ${srcdir}/sdk-install/usr/include/
 }
 
 package_libreoffice-sdk() {
@@ -607,7 +612,7 @@
  pkgdesc="a collection of dictionaries for spell checking, hyphenation and thesaurus"
  depends=('libreoffice')
  
- for dict in ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/pck/* ; do
-   unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/pck/${dict} -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${dict}
+ for lang in ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/pck/dict-* ; do
+   unzip ${lang} -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/`basename ${lang}`
  done
 }
\ No newline at end of file

Modified: libreoffice.install
===================================================================
--- libreoffice.install	2010-12-24 10:01:36 UTC (rev 103946)
+++ libreoffice.install	2010-12-24 12:30:01 UTC (rev 103947)
@@ -4,18 +4,22 @@
 update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
 
-echo " see http://wiki.archlinux.org/index.php/Openoffice"
-echo " how to use extensions, e.g. for spell checking"
-echo " see /usr/lib/ooo-3.3/share/extensions what"
-echo " is shipped with this package"
-echo " make sure you have installed a ttf font (ttf-dejavu recommended)"
+echo " * see http://wiki.archlinux.org/index.php/Openoffice"
+echo " * you may want to pacman -Ss libreoffice-extensions"
+echo "   to see what extensions are prepared to install"
+echo " * it's recommended to install the libreoffice-dictionaries pkg"
+echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
 }
 
 post_upgrade() {
-  post_install $1
+#  post_install $1
+gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+update-desktop-database -q
+update-mime-database usr/share/mime > /dev/null 2>&1
 }
 
 post_remove() {
 update-desktop-database -q
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+update-mime-database usr/share/mime > /dev/null 2>&1
 }




More information about the arch-commits mailing list