diff options
| author | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2009-05-04 21:05:59 +0000 |
|---|---|---|
| committer | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2009-05-04 21:05:59 +0000 |
| commit | 68aeccc2ae5845c8cea5f87dcebd495eebe6a6b0 (patch) | |
| tree | 4f5d7e8f5447e85f25800ad821ade10dc7a0e692 | |
| parent | 7974cf1d45e3c0d02bfcf13c4f331e9e9ae2845f (diff) | |
| download | slackbuilds-68aeccc2ae5845c8cea5f87dcebd495eebe6a6b0.tar.gz slackbuilds-68aeccc2ae5845c8cea5f87dcebd495eebe6a6b0.tar.bz2 | |
broffice fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2193 370017ae-e619-0410-ac65-c121f96126d4
| -rw-r--r-- | app/office/broffice/Manifest | 24 | ||||
| -rwxr-xr-x | app/office/broffice/broffice.SlackBuild | 25 |
2 files changed, 22 insertions, 27 deletions
diff --git a/app/office/broffice/Manifest b/app/office/broffice/Manifest index 637044fd..a4433659 100644 --- a/app/office/broffice/Manifest +++ b/app/office/broffice/Manifest @@ -1,23 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST BrOo_3.0.1_LinuxIntel_install_pt-BR.tar.gz 149194596 MD5 68883c544b9686a3cc34876004c65bac RMD160 7a2f71487a4d6fafb9b021249640bc8877df906d SHA1 1ec774eeac8542ba2d66a2c3759faffdfef7bd65 SHA256 ba4e96f4bfa3b7a9b252965c082b97cbefe29c4a955b42661dffb128ae7f5887 SHA512 c896639e20f8792b3df68138d2efafc56cee08367a0f85d6d83838ef8405aae49c4b85c1bc5880963bb09c771abb41056a92da24761843321a774dba1c965c23 -MKBUILD broffice.mkbuild 5365 MD5 015c267bd2cc89ab64499682d14ab563 RMD160 41dfd4abe481990a8caefbe1524dead06174c2c7 SHA1 ea538c04e6413c90290643f4073d64f13e99b12b SHA256 9574d30462b1c46e6acccf4ee90415d67b472fc969c7a3ff024944d1b1e8e1ec SHA512 729ac7833592eeb0b21e7cc8e36ac5b385218ff28fe724f9b00fc1e06f78f740d7dd55b60788313a2abc8b2ce00bd7f24810c24272586ed4c8a724c5eb8bddb9 -SLACKBUILD broffice.SlackBuild 5042 MD5 d2e38d8ef542942d09292e127cc3e9c3 RMD160 865e22a8c46fd64bb7b0994d62f3138e02f03634 SHA1 4be5808e3e0617f91335482158888a03660bc91e SHA256 cd09064d460096f9766a974d95655f2c567fbcf4f310cc0363c3f6d265483468 SHA512 30cd29dc9ba0be0157342c2b2faae011af13fc16d6e15c873de59ebffc1b376a9bc1900d4987ef95e947e5356bb59ec3723a5864648ca1efb763fc9387fcdbfb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iQIcBAEBAgAGBQJJ9bjkAAoJEEHL93ESzgeiCQIP/R4cqiBCUwWGMtx3+1n90yLS -yxwt0kp29Wd3EfErBjYecaBMtNaTfnOTmL7x2/zeuSy7+r0hrJyUtuB6eDDFlvvS -Dyd6cbbnAEdX8PudS0pAeAt25bXmsniB6uj9nEwlmQWU0HJ344F3hzQ3uZ52OxiK -D7/5tVkWMK+bxfemGbXgYgQn+yIe8Rct1L09jhtK9yruZ1MpAucKTscfbGjrFiqh -/88qIhNsyjmnG878Imd5jARx1Oz4mjTw/eFe3EA5XmbS0A63NVmwxXW4LyCFVp/F -26zyXauAuoPkIuDEWSji6Y9u6rU0xTJ4U3oiICjolmmn2U7H4UVDV5/oaS8br3y7 -h2uk0M1waS87eJ5+R+txdwrzKQfY1+0yP6eytPCWA1jhmFceU4gm0kYK17raXIG3 -3yNH39CU24SvraN0DbxumUg5lSOTkn+kJajbJGlAfopJIogrgfzjHvkbJIMQzALd -gSz69X/AwEBKmVexdZPXZM2VYFJS4xTOwxuVJnH8m4YS0mYp5BBbFHplUmdRmzo0 -+d8X2gr/1ImZovYnzKiF2unT2H5Ffm1WWWOAKMzzMjjDH9iJHReYBTM38yRw21NE -MRXqXyJEdPgzcreXzivr98+rwZ5mc2Xs1PbrZnLCry8vrAhkYS2CUh0YgN6lXv2i -Y0Ixb9MBQMmNkrK8OQpn -=/owU ------END PGP SIGNATURE----- +MKBUILD broffice.mkbuild 5899 MD5 a4a2407c7441e984cedaad4a9a55b4cd RMD160 85058ee2897d2f264c7520b498c1e864c1b09d00 SHA1 2eac641992a42664d72b48b0a99a561833ca6a63 SHA256 4eafc1f718f33adcaabe9d480fbee56e1ab710eaa52933f5fca9acc7ada694e8 SHA512 4a633cf80ce8e5535386acad5fdd466a583791daf8a70bf9abb3982b0761e71b6bb97fd40cfbb593cdfbc20f8bfbbebb499244023888bbb94187464d1d3576de +SLACKBUILD broffice.SlackBuild 5576 MD5 680fa6cda9219f650292d26933855883 RMD160 8035dc09f5beb0dfd1689935a9a38d1143c148d8 SHA1 89ee118ea6f103428577f8b83ec0ed1f50f7115a SHA256 9600d468bf040e5c1a9fe806b51172232747ab57f6c85b8f149fc08c7cf83584 SHA512 ec3ec0098230c0e3597a380ffdb3cd5e6fa6ec6dc4f72c7cc8bc31138c262f228dc470621bdd5d723fa2c9d3e5ae6be2c484cf522c109f7ec77680b47a135458 diff --git a/app/office/broffice/broffice.SlackBuild b/app/office/broffice/broffice.SlackBuild index 5205b110..3161b7a8 100755 --- a/app/office/broffice/broffice.SlackBuild +++ b/app/office/broffice/broffice.SlackBuild @@ -40,7 +40,7 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/office/broffice"} -PREFIX=${PREFIX:=/usr/share/broffice.org} +PREFIX=${PREFIX:=/usr/share/openoffice.org} PKG_WORK="$TMP/$SRC_NAME" CONF_OPTIONS=${CONF_OPTIONS:=""} NUMJOBS=${NUMJOBS:=""} @@ -91,20 +91,35 @@ rm *.rpm 2>/dev/null # Convert links to KDE cd desktop-integration -echo -e "\ninstall broffice.org-slackware-menus-*.rpm" -tar xvf broffice.org*-slackware-menus-*.tgz -C $PKG || exit $ERROR_TAR +echo -e "\ninstall broffice.org3.0-slackware-menus-3.0*.tgz" +tar xvf broffice.org3.0-slackware-menus-3.0*.tgz -C $PKG || exit $ERROR_TAR rm *.rpm *.deb 2>/dev/null cd .. # Change opt directory mkdir -p $PKG/usr/share -mv $PKG/opt/broffice.org* $PKG/usr/share/ +mv $PKG/opt/openoffice.org $PKG/usr/share/ +mv $PKG/opt/broffice.org3/* $PKG/usr/share/openoffice.org + +cat << EOF > $PKG/usr/bin/broffice.org3 +#!/bin/sh +exec /usr/share/openoffice.org/program/soffice "\$@" +EOF + +cat << EOF > $PKG/usr/bin/broffice.org3-printeradmin +#!/bin/sh +exec /usr/share/openoffice.org/program/spadmin +EOF + +chmod +x $PKG/usr/bin/broffice.org3-printeradmin $PKG/usr/bin/broffice.org3 mv $PKG/opt/kde/share/* $PKG/usr/share/ rm -rf $PKG/opt # Change doinstall install directory -sed 's/\/opt\/broffice.org/\/usr\/share\/broffice.org\//' $PKG/install/doinst.sh > $PKG/install/doinst.sh.new +# REMOVE-ME!!! do the following lines work? +sed 's/\/opt\/openoffice.org/\/usr\/share\/openoffice.org\//' $PKG/install/doinst.sh > $PKG/install/doinst.sh.new +sed 's/\/opt/broffice.org3/\/usr\/share\/openoffice.org\//' $PKG/install/doinst.sh > $PKG/install/doinst.sh.new mv $PKG/install/doinst.sh.new $PKG/install/doinst.sh # Strip binaries |