diff options
| -rw-r--r-- | misc/merkaartor/merkaartor.SlackBuild | 14 | ||||
| -rw-r--r-- | misc/merkaartor/merkaartor.info | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/misc/merkaartor/merkaartor.SlackBuild b/misc/merkaartor/merkaartor.SlackBuild index 492dac14fe41..3c59e0dd2001 100644 --- a/misc/merkaartor/merkaartor.SlackBuild +++ b/misc/merkaartor/merkaartor.SlackBuild @@ -5,16 +5,14 @@ # Written by otzy_007 (oz@oprod.net) PRGNAM=merkaartor -VERSION=${VERSION:-0.16.3} +VERSION=${VERSION:-0.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -55,11 +53,13 @@ find . \ make -C translations release -qmake -unix PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - NODEBUG=1\ +qmake \ QMAKE_CFLAGS="$SLKCFLAGS" \ - LIBDIR="/usr/lib${LIBDIRSUFFIX}"\ - QMAKE_CXXFLAGS="$SLKCFLAGS" + QMAKE_CXXFLAGS="$SLKCFLAGS" \ + NODEBUG=1 \ + PREFIX=/usr \ + DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + LIBDIR="/usr/lib${LIBDIRSUFFIX}" make make install INSTALL_ROOT=$PKG diff --git a/misc/merkaartor/merkaartor.info b/misc/merkaartor/merkaartor.info index 37bb27f451b7..8f8cf01396d7 100644 --- a/misc/merkaartor/merkaartor.info +++ b/misc/merkaartor/merkaartor.info @@ -1,10 +1,10 @@ PRGNAM="merkaartor" -VERSION="0.16.3" +VERSION="0.17.0" HOMEPAGE="http://www.merkaartor.org" -DOWNLOAD="http://merkaartor.be/attachments/download/29/merkaartor-0.16.3.tar.bz2" -MD5SUM="4ff2bc53c2f37704a55463372fa7d376" +DOWNLOAD="http://merkaartor.be/attachments/download/192/merkaartor-0.17.0.tar.bz2" +MD5SUM="022557de290233bc879bdf794cdd40f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="otzy_007" EMAIL="oz@oprod.net" -APPROVED="dsomero" +APPROVED="rworkman" |