summaryrefslogtreecommitdiffstats
path: root/libreoffice
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-05-30 15:18:55 +0000
committer Eric Hameleers <alien@slackware.com>2011-05-30 15:18:55 +0000
commit3a842874c81ff3d6e8df900c8c657c17e6a5203e (patch)
treec148b8f580f93ef5aa10ab16b241dedcd0e160fc /libreoffice
parent9d8bd35e5e396c5908cd7ffc9dbc076e2a29042e (diff)
downloadasb-3a842874c81ff3d6e8df900c8c657c17e6a5203e.tar.gz
asb-3a842874c81ff3d6e8df900c8c657c17e6a5203e.tar.xz
Try to restore the build version info in the "About" dialog
Diffstat (limited to 'libreoffice')
-rw-r--r--libreoffice/build/Slackware.conf.in1
-rwxr-xr-xlibreoffice/build/libreoffice36.SlackBuild9
2 files changed, 8 insertions, 2 deletions
diff --git a/libreoffice/build/Slackware.conf.in b/libreoffice/build/Slackware.conf.in
index 103c85a4..b757ca31 100644
--- a/libreoffice/build/Slackware.conf.in
+++ b/libreoffice/build/Slackware.conf.in
@@ -35,6 +35,7 @@
--enable-xrender-link
--with-ant-home=/usr/share/ant
--with-arch=x86
+--with-build-version=SlackBuild for @BUILDVERSION@ by @PACKAGER@
--with-dict=ALL
--with-extension-integration
--with-external-dict-dir=/usr/share/hunspell
diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index 03e703b2..c6aabf5c 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -133,6 +133,8 @@ DOCS="AUTHORS COPYING* MAINTAINERS NEWS README* TODO"
NUMCPUS=${NUMCPUS:-2}
+PACKAGER="Eric Hameleers"
+
# Where do we look for sources?
SRCDIR=$(cd $(dirname $0); pwd)
@@ -684,7 +686,11 @@ export OOInstall="/usr/lib${LIBDIRSUFFIX}/libreoffice"
export OODESTDIR="$PKG"
# Substitute our Slackware-specific configuration:
-cat $SRCDIR/Slackware.conf.in |sed -e "s#@JAVA_HOME@#$JAVA_HOME#" > distro-configs/Slackware.conf
+cat $SRCDIR/Slackware.conf.in | \
+ sed -e "s#@JAVA_HOME@#$JAVA_HOME#" \
+ -e "s#@BUILDVERSION@#${LOVER}$VERSION#" \
+ -e "s#@PACKAGER@#$PACKAGER#" \
+ > distro-configs/Slackware.conf
# If this local directory does not exist during configuration,
# support for Open Clip Art will be disabled:
@@ -707,7 +713,6 @@ echo "Building for these languages: $LANGUAGES"
enable_pam=no \
./autogen.sh \
--with-arch-flags="$SLKCFLAGS" \
- --with-build-version="SlackBuild for ${LOVER}$VERSION by Eric Hameleers" \
--with-package-format="native archive installed tardist" \
--with-distro=Slackware \
--with-docdir=/usr/doc/$PRGNAM-${LOVER}$VERSION \