summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--office/libreoffice/README9
-rw-r--r--office/libreoffice/libreoffice.SlackBuild9
-rw-r--r--office/libreoffice/libreoffice.info12
3 files changed, 19 insertions, 11 deletions
diff --git a/office/libreoffice/README b/office/libreoffice/README
index 0d4185ba98..a885f4e61a 100644
--- a/office/libreoffice/README
+++ b/office/libreoffice/README
@@ -15,3 +15,12 @@ NOTE: See the separate SlackBuild script for the language packs.
NOTE2: To keep LibreOffice installed concurrently with OpenOffice, run the
included "open-libre-together.sh" script saved in the documentation
directory of this package to patch the .desktop menu files.
+
+NOTE3: LibreOffice versions change quite often. If the version for which
+ this script was written is no longer available, look for it at:
+ http://download.documentfoundation.org/libreoffice/old/stable/
+ It will go there after the next release.
+ You can also try building the newer version using:
+ # VERSION="x.y.z" ./libreoffice.SlackBuild
+ This *might* work, but upstream has a habit of changing the naming
+ and structure of the files, etc. between versions, so: YMMV.
diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild
index bf586ca60c..bceb42587f 100644
--- a/office/libreoffice/libreoffice.SlackBuild
+++ b/office/libreoffice/libreoffice.SlackBuild
@@ -24,17 +24,16 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Modified by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2011/06/20
+# Revision date: 2011/08/01
PRGNAM=libreoffice
-VERSION="3.4.0"
+VERSION=${VERSION:-"3.4.2"}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
# These variables seem to change with (almost) every release...
SRCVERSION=$VERSION
-SRCSHORT="3.4"
-SRCBUILD="3.4-12"
+SRCSHORT=$(echo $VERSION | cut -f1-2 -d.) #"3.4"
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -111,7 +110,7 @@ cd $TMP/$SOURCEDIR/RPMS/
# Yes, I know there is a Slackware integration file in the desktop-integration
# directory, but it's worthless to us. I'd prefer to do things correctly.
-mv desktop-integration/libreoffice$SRCSHORT-freedesktop-menus-$SRCBUILD.noarch.rpm .
+mv desktop-integration/libreoffice$SRCSHORT-freedesktop-menus-$SRCSHORT-*.noarch.rpm .
# No, I don't want to update our packaged files after the fact
rm -f *onlineupdate*.rpm # We don't want this
diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info
index 8494661363..a2a906dba4 100644
--- a/office/libreoffice/libreoffice.info
+++ b/office/libreoffice/libreoffice.info
@@ -1,10 +1,10 @@
PRGNAM="libreoffice"
-VERSION="3.4.0"
+VERSION="3.4.2"
HOMEPAGE="http://www.libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.4.0/rpm/x86/LibO_3.4.0_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="236aa36128f195d22cba23cdd8d64c1c"
-DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.4.0/rpm/x86_64/LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="9970418f3e05538a0dcb062768b6b6f8"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.4.2/rpm/x86/LibO_3.4.2_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="502bb95b7ec6e652f7ff6edef31db2a9"
+DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.4.2/rpm/x86_64/LibO_3.4.2_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="beb2a4925365a7df0fd214c955e15c56"
MAINTAINER="Niels Horn"
EMAIL="niels.horn@gmail.com"
-APPROVED="pprkut"
+APPROVED="rworkman"