[arch-commits] Commit in libreoffice/trunk (PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Sep 28 19:47:04 UTC 2010
Date: Tuesday, September 28, 2010 @ 15:47:04
Author: andyrtr
Revision: 92080
fix source array and md5sums; rename some vars
Modified:
libreoffice/trunk/PKGBUILD
----------+
PKGBUILD | 107 +++++++++++++++++++++++++------------------------------------
1 file changed, 45 insertions(+), 62 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-09-28 19:20:28 UTC (rev 92079)
+++ PKGBUILD 2010-09-28 19:47:04 UTC (rev 92080)
@@ -7,7 +7,7 @@
pkgrel=1
pkgdesc="a productivity suite that is compatible with other major office suites"
arch=('i686' 'x86_64')
-_go_tree="3.3"
+_LO_tree="3.3"
_ootag=ooo330-m7 # m18/m19 = OOo 3.2.1 RC
license=('LGPL3')
url="http://www.freedesktop.org/wiki/Software/LibreOffice"
@@ -43,58 +43,41 @@
'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/go-openoffice/program/sofficerc)
-provides=('openoffice-base')
-conflicts=('openoffice-base')
-_mirror="http://download.documentfoundation.org/libreoffice/src/"
-source=(${_mirror}/${_go_tree}/${pkgname}-build-${_LOver}.tar.gz
-libreoffice-build-3.2.99.1.tar.gz
+backup=(usr/lib/libreoffice/program/sofficerc)
+provides=('openoffice-base' 'go-openoffice')
+conflicts=('openoffice-base' 'go-openoffice')
+_mirror="http://download.documentfoundation.org/libreoffice/src"
+source=(${_mirror}/${pkgname}-build-${_LOver}.tar.gz
+# ${_mirror}/libreoffice-\
+ ${_mirror}/${pkgname}-\
+{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,l10n,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2
ArchLinux.patch
-# ${pkgname}-${_ootag}.tar.xz
- ${_mirror}/{pkgname}-build-${_LOver}-\
-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,l10n,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}.tar.bz2
-# http://download.go-oo.org/DEV300/ooo-cli-prebuilt-3.2.1.tar.bz2
-# http://cairographics.org/releases//cairo-1.4.10.tar.gz
-# http://download.go-oo.org/SRC680/mdbtools-0.6pre1.tar.gz
-# http://download.go-oo.org/SRC680/extras-3.tar.bz2
-# http://download.go-oo.org/SRC680/biblio.tar.bz2
-# http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll
-# http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
-# http://download.go-oo.org/libwpd/libwpd-0.8.14.tar.gz
-# http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
-# http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz
-# http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz
-# http://download.go-oo.org/src/seamonkey-1.1.14.source.tar.gz
-# http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz
-# http://multidimalgorithm.googlecode.com/files//mdds_0.3.0.tar.bz2
buildfix_64bit_system_libjpeg.diff)
#options=('!makeflags')
-noextract=(ooo-build-${_LOver}-\
-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,l10n,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}.tar.bz2
- ooo-cli-prebuilt-3.2.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll
- scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
-md5sums=('a87e9441f1ce0bd427ec20696555fa78'
+noextract=(libreoffice-\
+{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,l10n,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2)
+md5sums=('9f48404252c0440c9fb668e2634f56ec'
+ '5340511b6bc2043f642be4ee1e8bf3a7'
+ '6ef55d438e487e243f96e5c7ce3fe6ec'
+ '57b68ba83440a900533b40063191cfa5'
+ 'daa04e0294bee6c285f004896aa609c8'
+ '8a9393624078d473ac4480cb6b549c20'
+ '271da86a068de92d57e4f9c65d512cc5'
+ '436f19879bd561eef407ce74a3e9f18e'
+ '42332f99506dff9780ebcd5d65b60034'
+ 'fe17733e7afa553d25b57fb9c7dcfa2c'
+ 'd6dc499bc930629304b1aa3abdfada76'
+ '921f6e161f33b66fbc7c550bfeb74e6f'
+ '9c5bdbb9aac46518aeb033e3a63184e2'
+ '5299b08196e521e1fcd4f7665ab0aea9'
+ 'd9d45344146d591c51f944fcdc62ee6c'
+ 'f8638cdfbd58b2a367cf3fe70b4b0c44'
+ '9df015c8299af8bf8b88d5b6288fd6fa'
+ 'acbc48dba8bff10b1b5cf46f57597549'
+ '2cf115243dcfa686868e49927437d61f'
+ '310bf13fb37477cb0b533e92596c4c23'
+ '1fb344dd20334f42d7632e2f76ffb54c'
'a77cc2fdff90146485e0b1f1398bb0d4'
- '33493144d480288425a9d045e4a03239'
- '7ccbeb34f03f95cf47980807f573bc1b'
- '3113682ad0fa810a4c71d125af50911a'
- '41692fd8832325c155aeed5fe02c3519'
- '97aac991f49bcdd6642af431375ba5e3'
- '32c91b5cce09672c9b0d535a312700c7'
- 'aa5e50337e39561c63cadcf8fc6fe29c'
- '80ea97fe2621f0e152a6a0a435b8f495'
- '3a42d5e7181cc00eaf18ac2068d47c05'
- '411abf929900273fa4c5cfbe5b60da83'
- '999a656c25bf9b44cea1c37d58698b44'
- '89f10d2fc849e65917cc539a0f413669'
- '52d562eefcc0c14f846b20b0855deec8'
- '6371193bdf5e68dd16c479100e1bcd8f'
- '7dab980fdcf1c591c368ad50e8b6c14d'
- '7c45f516b932b360243f8418acd0fb25'
- 'b4c912ebc08cb40822ae0b91bdb43a5c'
- '64b58c0f7be982f4afc69dabe9b1bcc6'
- 'fe8a26911aabeb7f1c140a5fc506d494'
- '5b03d5f6ad8973b4f6e96334c3b9a624'
'b005c4cf9f8e586539ca98c9cfe9bb77')
# source PKGBUILD && mksource
@@ -102,12 +85,12 @@
# source /etc/makepkg.conf && echo ${SRCDEST}
# mkdir /tmp/$pkgname-source
# pushd /tmp/$pkgname-source
-# if [ -e ${SRCDEST}/ooo-build-${_LOver}.tar.gz ]; then
-# cp $SRCDEST/ooo-build-${_LOver}.tar.gz .
-# else wget ${_mirror}/${_go_tree}/ooo-build-${_GOver}.tar.gz
+# if [ -e ${SRCDEST}/{pkgname}-build-${_LOver}.tar.gz ]; then
+# cp $SRCDEST/{pkgname}-build-${_LOver}.tar.gz .
+# else wget ${_mirror}/${_LO_tree}/{pkgname}-build-${_LOver}.tar.gz
# fi
-# tar -xvf ooo-build-${_GOver}.tar.gz
-# cd ooo-build-${_GOver}
+# tar -xvf {pkgname}-build-${_LOver}.tar.gz
+# cd {pkgname}-build-${_LOver}
# ./configure --quiet --with-distro=ArchLinux
# ./download --all
# pushd src; tar -cvJf ../../${pkgname}-${_ootag}.tar.xz clone; popd
@@ -120,14 +103,14 @@
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
- cd ${srcdir}/ooo-build-${_GOver}
+ cd ${srcdir}/{pkgname}-build-${_LOver}
# our ArchLinux distribution patch until we go upstream
patch -Np0 -i ${srcdir}/ArchLinux.patch || return 1
# hotfixes not yet upstream
-# cp ${srcdir}/*.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
- cp ${srcdir}/buildfix_64bit_system_libjpeg.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
+# cp ${srcdir}/*.diff ${srcdir}/{pkgname}-build-${_LOver}/patches/hotfixes/
+ cp ${srcdir}/buildfix_64bit_system_libjpeg.diff ${srcdir}/{pkgname}-build-${_LOver}/patches/hotfixes/
# export C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -141,11 +124,11 @@
# autoreconf
./configure --with-distro=ArchLinux \
- --with-build-version="${_GOver} ArchLinux build-${pkgrel} (${_ootag})"\
+ --with-build-version="${_LOver} ArchLinux build-${pkgrel} (${_ootag})"\
--without-git \
--with-srcdir=${srcdir} \
--with-max-jobs=${MAKEFLAGS/-j/} \
- --with-installed-ooo-dirname="${pkgname}" \
+ --with-installed-{pkgname}-dirname="${pkgname}" \
--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
--with-docdir=/usr/share/doc/packages/"${pkgname}" \
--mandir=/usr/share/man \
@@ -210,18 +193,18 @@
}
package() {
- cd ${srcdir}/ooo-build-${_GOver}
+ cd ${srcdir}/{pkgname}-build-${_LOver}
LD_PRELOAD="" make DESTDIR=${pkgdir} install || return 1
# install all built dictionaries from source tree
- pushd ${srcdir}/ooo-build-${_GOver}/build/${_ootag}/dictionaries/unxlng?6.pro/bin/
+ pushd ${srcdir}/{pkgname}-build-${_LOver}/build/${_ootag}/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}/ooo-build-${_GOver}/build/${_ootag}/solver/320/unxlng?6.pro/bin/
+ pushd ${srcdir}/{pkgname}-build-${_LOver}/build/${_ootag}/solver/320/unxlng?6.pro/bin/
install -D -m644 report-builder.oxt ${pkgdir}/usr/lib/openoffice/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
More information about the arch-commits
mailing list