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

[Andreas Radke]

    Date: Thursday, March 7, 2013 @ 05:53:24
  Author: andyrtr
Revision: 179553

upgpkg: libreoffice 4.0.1-1

upstream update 4.0.1

Modified:
  libreoffice/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-06 21:11:33 UTC (rev 179552)
+++ PKGBUILD	2013-03-07 04:53:24 UTC (rev 179553)
@@ -40,8 +40,8 @@
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
@@ -152,9 +152,9 @@
 
 build() {
 
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+#	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
+#	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
+#	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
     cd ${srcdir}/libreoffice-$_LOver
 
@@ -539,7 +539,7 @@
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
  
-  # fix environment path to keep compatibility with openjdk6 and openjdk7
+  # fix environment path to keep compatibility with other java-environments
   sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
 }