diff options
| -rw-r--r-- | office/libreoffice/libreoffice.SlackBuild | 14 | ||||
| -rw-r--r-- | office/libreoffice/libreoffice.info | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild index 83c456cde2..cc32782ede 100644 --- a/office/libreoffice/libreoffice.SlackBuild +++ b/office/libreoffice/libreoffice.SlackBuild @@ -24,15 +24,17 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Niels Horn <niels.horn@gmail.com> -# Revision date: 2011/01/03 +# Revision date: 2011/03/01 PRGNAM=libreoffice -VERSION="3.3.0" +VERSION="3.3.1" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# I'll leave this line here, since I have to change it with every release... +# These variables seem to change with (almost) every release... SRCVERSION=$VERSION +SRCSHORT="3.3" +SRCBUILD="3.3-8" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -109,7 +111,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/libreoffice3.3-freedesktop-menus-3.3-6.noarch.rpm . +mv desktop-integration/libreoffice$SRCSHORT-freedesktop-menus-$SRCBUILD.noarch.rpm . # No, I don't want to update our packaged files after the fact rm -f *onlineupdate*.rpm # We don't want this @@ -132,7 +134,7 @@ cd $PKG/usr/bin cd - # Remove DejaVu and Liberation fonts - these are included in other packages -rm -f opt/libreoffice/basis3.3/share/fonts/truetype/{DejaVu,Liberation}*.ttf +rm -f opt/libreoffice/basis$SRCSHORT/share/fonts/truetype/{DejaVu,Liberation}*.ttf # Fix Exec commands in the desktop files # See http://bugzilla.xfce.org/show_bug.cgi?id=2430 @@ -176,4 +178,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh chown -R root:root . find . -type d -exec chmod 755 {} \; chmod -R u+rw,go+r-w,a-s . -/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info index b745b84b18..825a93a17d 100644 --- a/office/libreoffice/libreoffice.info +++ b/office/libreoffice/libreoffice.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice" -VERSION="3.3.0" +VERSION="3.3.1" HOMEPAGE="http://www.documentfoundation.org" -DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.3.0/rpm/x86/LibO_3.3.0_Linux_x86_install-rpm_en-US.tar.gz" -MD5SUM="8e9c2e374fb96ed85c7a7878ce718ef6" -DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.3.0/rpm/x86_64/LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz" -MD5SUM_x86_64="82c0f1428b841567d76428d57b6c1b18" +DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.3.1/rpm/x86/LibO_3.3.1_Linux_x86_install-rpm_en-US.tar.gz" +MD5SUM="2e0d62996288baf2ba9fc89261a1f544" +DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.3.1/rpm/x86_64/LibO_3.3.1_Linux_x86-64_install-rpm_en-US.tar.gz" +MD5SUM_x86_64="ce693d7684d443bb061eafcb6e8bcc0a" MAINTAINER="Niels Horn" EMAIL="niels.horn@gmail.com" APPROVED="rworkman" |