Date: Wednesday, October 6, 2010 @ 09:47:23
Author: andyrtr
Revision: 94288
some small build fixes
Modified:
libreoffice/trunk/PKGBUILD
libreoffice/trunk/libreoffice.install
Deleted:
libreoffice/trunk/python2_detection.diff
------------------------+
PKGBUILD | 29 ++---------------------------
libreoffice.install | 2 +-
python2_detection.diff | 11 -----------
3 files changed, 3 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-10-06 13:25:53 UTC (rev 94287)
+++ PKGBUILD 2010-10-06 13:47:23 UTC (rev 94288)
@@ -43,7 +43,7 @@
'mesa: for the OGLTrans extension'
'mono: allows UNO automation with Mono'
'gstreamer0.10-base: + some gstr-plugins to support multimedia
content, e.g. in impress')
-backup=(usr/lib/libreoffice/program/sofficerc)
+backup=(usr/lib/ooo-3.3/program/sofficerc)
provides=('openoffice-base' 'go-openoffice')
conflicts=('openoffice-base' 'go-openoffice')
_mirror="http://download.documentfoundation.org/libreoffice/src";
@@ -358,29 +358,4 @@
cd ${srcdir}/${pkgname}-build-${_LOver}
#bin/ooinstall <path-to-install>
LD_PRELOAD="" make DESTDIR=${pkgdir} install || return 1
-
- # install all built dictionaries from source tree
- pushd
${srcdir}/${pkgname}-build-${_LOver}/build/${pkgname}-${_LOver}/dictionaries/unxlng?6.pro/bin/
- for i in `ls -1 dict-??.oxt`; do
- install -D -m644 $i
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/$i || return 1
- done
- popd
-
- # install all other built extensions
- pushd
${srcdir}/${pkgname}-build-${_LOver}/build/${pkgname}-${_LOver}/solver/320/unxlng?6.pro/bin/
- install -D -m644 report-builder.oxt
${pkgdir}/usr/lib/${pkgname}/share/extension/install/report-builder.oxt ||
return 1
- install -D -m644 swext/wiki-publisher.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/wiki-publisher.oxt ||
return 1
- install -D -m644 minimizer/presentation-minimizer.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/presentation-minimizer.oxt
|| return 1
- install -D -m644 presenter/presenter-screen.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/presenter-screen.oxt ||
return 1
- install -D -m644 pdfimport/pdfimport.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/pdfimport.oxt || return 1
- popd
-
- # fix unopkg call for mktemp, #15410
- sed -i "s:\/bin\/mktemp:\/usr\/bin\/mktemp:"
${pkgdir}/usr/lib/${pkgname}/program/unopkg || return 1
-
- #fix http://bugs.archlinux.org/task/17656
-# find ${pkgdir} -perm 444 -exec ls -lh {} \;
-# find ${pkgdir} -perm 444 -exec chmod 644 {} \;
-# find ${pkgdir} -perm 555 -exec ls -lh {} \;
-# find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
+}
\ No newline at end of file
Modified: libreoffice.install
===================================================================
--- libreoffice.install 2010-10-06 13:25:53 UTC (rev 94287)
+++ libreoffice.install 2010-10-06 13:47:23 UTC (rev 94288)
@@ -6,7 +6,7 @@
echo " see http://wiki.archlinux.org/index.php/Openoffice";
echo " how to use extensions, e.g. for spell checking"
-echo " see /usr/lib/go-openoffice/share/extension/install what"
+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)"
}
Deleted: python2_detection.diff
===================================================================
--- python2_detection.diff 2010-10-06 13:25:53 UTC (rev 94287)
+++ python2_detection.diff 2010-10-06 13:47:23 UTC (rev 94288)
@@ -1,11 +0,0 @@
---- configure 2010-09-28 14:02:25.000000000 +0200
-+++ configure.new 2010-10-05 21:20:37.903408283 +0200
-@@ -16702,7 +16702,7 @@
- $as_echo_n "(cached) " >&6
- else
-
-- for am_cv_pathless_PYTHON in python python2 python2.5 python2.4
python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-+ for am_cv_pathless_PYTHON in python2.7 python2 python2.5 python2.4
python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
- test "$am_cv_pathless_PYTHON" = none && break
- prog="import sys, string
- # split strings by '.' and convert to numeric. Append some zeros
