aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/openoffice.org/doinst.sh4
-rw-r--r--office/openoffice.org/openoffice.org.SlackBuild7
-rw-r--r--office/openoffice.org/openoffice.org.info10
3 files changed, 11 insertions, 10 deletions
diff --git a/office/openoffice.org/doinst.sh b/office/openoffice.org/doinst.sh
index 940c95e51ab96..14bfd4aa3d885 100644
--- a/office/openoffice.org/doinst.sh
+++ b/office/openoffice.org/doinst.sh
@@ -6,9 +6,9 @@ if [ -x /usr/bin/update-mime-database ]; then
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
for theme in gnome locolor hicolor ; do
- if [ -e usr/share/icons/$theme/icon-theme.cache ]; then
+ if [ -e usr/share/icons/$theme/icon-theme.cache ]; then
/usr/bin/gtk-update-icon-cache -f usr/share/icons/$theme >/dev/null 2>&1
fi
done
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 5bf500ff28f8c..857e7cdc9f12a 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -30,8 +30,9 @@
PRGNAM=openoffice.org
SRCNAM=openoffice
-VERSION=${VERSION:-4.1.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.1.6}
+BUILD_ID=${BUILD_ID:-9790}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRCSHORT=$(echo $VERSION | cut -f1 -d.)
@@ -100,7 +101,7 @@ rm -f *onlineupdate*.rpm
for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done
cd desktop-integration
-rpm2cpio < openoffice$VERSION-freedesktop-menus-$VERSION-9789.noarch.rpm | cpio -imdv
+rpm2cpio < openoffice$VERSION-freedesktop-menus-$VERSION-$BUILD_ID.noarch.rpm | cpio -imdv
cd -
mv opt $PKG
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index 8c0b3a4c9984f..26660e98c6d45 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,10 +1,10 @@
PRGNAM="openoffice.org"
-VERSION="4.1.5"
+VERSION="4.1.6"
HOMEPAGE="https://openoffice.org"
-DOWNLOAD="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.5/binaries/en-US/Apache_OpenOffice_4.1.5_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="4e8acf5e611d0d5bf0386ef651255cd2"
-DOWNLOAD_x86_64="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.5/binaries/en-US/Apache_OpenOffice_4.1.5_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="256ae2b559f771ebef9e5d4d6f076044"
+DOWNLOAD="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.6/binaries/en-US/Apache_OpenOffice_4.1.6_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="bce40d89c33b7fba8ea5a963e1c623cc"
+DOWNLOAD_x86_64="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.6/binaries/en-US/Apache_OpenOffice_4.1.6_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="d47fa2274aad8e263eff9b913470d2cb"
REQUIRES=""
MAINTAINER="Donald Cooley"
EMAIL="chytraeu@sdf.org"