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

[andyrtr at archlinux.org]

    Date: Thursday, May 5, 2011 @ 09:24:10
  Author: andyrtr
Revision: 122652

prepare 3.4 branch builds; fix i686 installation, i686 build is still broken

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-05 13:23:04 UTC (rev 122651)
+++ PKGBUILD	2011-05-05 13:24:10 UTC (rev 122652)
@@ -329,7 +329,7 @@
 	
 	# workaround broken make $DESTDIR install :(
 #	install -dm755 ${pkgdir}/usr/lib/libreoffice
-#	mv instsetoo_native/unxlngx6.pro/LibreOffice/native/install/LibO_3.4.0beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/* ${pkgdir}/usr/lib/libreoffice
+#	mv instsetoo_native/unxlng*/LibreOffice/native/install/LibO_3.4.0beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/* ${pkgdir}/usr/lib/libreoffice
 #	chmod -R +w ${pkgdir}/usr/lib/libreoffice
 	
 	# fix missing desktop integration
@@ -369,7 +369,7 @@
 	sed -i -e 's/Icon=libreoffice-/Icon=/' ${pkgdir}/usr/share/applications/*.desktop
 
 	# add missing mimetype file
-	install -m644 ${srcdir}/build/sysui/unxlngx6.pro/misc/libreoffice/openoffice.org.xml ${pkgdir}/usr/share/mime/packages/libreoffice.xml
+	install -m644 ${srcdir}/build/sysui/unxlng*/misc/libreoffice/openoffice.org.xml ${pkgdir}/usr/share/mime/packages/libreoffice.xml
 
 	# put configuration files into place
 	install -dm755 ${pkgdir}/etc/libreoffice
@@ -422,7 +422,7 @@
 
 #	cd ${srcdir}/build
 #	install -dm755 ${pkgdir}/usr/lib/libreoffice
-#	mv instsetoo_native/unxlngx6.pro/LibreOffice_SDK/native/install/LibO-SDK_3.4beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/* ${pkgdir}/usr/lib/libreoffice
+#	mv instsetoo_native/unxlng*/LibreOffice_SDK/native/install/LibO-SDK_3.4beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/* ${pkgdir}/usr/lib/libreoffice
 
 	cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
 #	for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do