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

[andyrtr at archlinux.org]

    Date: Monday, May 31, 2010 @ 12:59:32
  Author: andyrtr
Revision: 81525

make source name usable for stable OOo pkg, fix sdk paths

Modified:
  openoffice-base-beta/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-31 16:57:52 UTC (rev 81524)
+++ PKGBUILD	2010-05-31 16:59:32 UTC (rev 81525)
@@ -21,7 +21,7 @@
 	     'redland' 'libgraphite' 'hyphen' 'lpsolve'
 	     'hicolor-icon-theme' 'desktop-file-utils' 'gtk2')
 	     # 'saxon' 
-source=(${pkgname}-${_OO_milestone}.tar.xz
+source=(${_OO_milestone}.tar.xz
 	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 	startcenter.desktop
 	default-no-startup-wizard.diff
@@ -42,7 +42,7 @@
 	mkdir /tmp/$pkgname-source
 	pushd /tmp/$pkgname-source
 	hg -v clone -r ${_OO_milestone} http://hg.services.openoffice.org/hg/OOO320 ${_OO_milestone}
-	tar -cvJf ${pkgname}-${_OO_milestone}.tar.xz ${_OO_milestone}/*
+	tar -cvJf ${_OO_milestone}.tar.xz ${_OO_milestone}/*
 	popd
 }
 
@@ -367,10 +367,10 @@
 	
 	for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s, at OO_SDK_NAME@,sdk," \
-            -e "s, at OO_SDK_HOME@,/usr/lib/openoffice-dev/basis-link/sdk," \
-            -e "s, at OFFICE_HOME@,/usr/lib/openoffice-dev," \
-            -e "s, at OFFICE_BASE_HOME@,/usr/lib/openoffice-dev/basis-link," \
-            -e "s, at OO_SDK_URE_HOME@,/usr/lib/openoffice-dev/basis-link/ure-link," \
+            -e "s, at OO_SDK_HOME@,/usr/lib/openoffice-beta/basis-link/sdk," \
+            -e "s, at OFFICE_HOME@,/usr/lib/openoffice-beta," \
+            -e "s, at OFFICE_BASE_HOME@,/usr/lib/openoffice-beta/basis-link," \
+            -e "s, at OO_SDK_URE_HOME@,/usr/lib/openoffice-beta/basis-link/ure-link," \
             -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
             -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
             -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \