From 34e09a4b069df71d8dbad64605b7ac81c997f316 Mon Sep 17 00:00:00 2001 From: Audrius Kažukauskas Date: Sun, 17 Nov 2013 11:19:14 +0100 Subject: system/multicorn: Changed tarball name/handling. Signed-off-by: Matteo Bernardini --- system/multicorn/multicorn.SlackBuild | 14 ++++++++++---- system/multicorn/multicorn.info | 6 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/system/multicorn/multicorn.SlackBuild b/system/multicorn/multicorn.SlackBuild index e804aae773..eaf1c5b25d 100644 --- a/system/multicorn/multicorn.SlackBuild +++ b/system/multicorn/multicorn.SlackBuild @@ -23,10 +23,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=multicorn -VERSION=${VERSION:-1.0.0beta1} +VERSION=${VERSION:-1.0.0_beta1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCVERSION=$(echo $VERSION | tr _ -) + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; @@ -60,7 +62,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip +unzip $CWD/$PRGNAM-$SRCVERSION.zip +mv $PRGNAM-$SRCVERSION $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -69,8 +72,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Set Python code installation path. -sed -i "s|install$|install --root=$PKG|" Makefile +# Set Python code installation path and fix Makefile. +sed -i \ + -e "s|install$|install --root=$PKG|" \ + -e 's|^DATA =.*$|DATA = $(wildcard sql/*--*.sql)|' \ + Makefile CFLAGS="$SLKCFLAGS" make make install DESTDIR=$PKG diff --git a/system/multicorn/multicorn.info b/system/multicorn/multicorn.info index bb910b69ae..88ba93314b 100644 --- a/system/multicorn/multicorn.info +++ b/system/multicorn/multicorn.info @@ -1,8 +1,8 @@ PRGNAM="multicorn" -VERSION="1.0.0beta1" +VERSION="1.0.0_beta1" HOMEPAGE="http://multicorn.org/" -DOWNLOAD="http://api.pgxn.org/dist/multicorn/1.0.0beta1/multicorn-1.0.0beta1.zip" -MD5SUM="157206021c3ff5dbc2eb97d55ad1f4f2" +DOWNLOAD="http://api.pgxn.org/dist/multicorn/1.0.0-beta1/multicorn-1.0.0-beta1.zip" +MD5SUM="ad67a86295ec7bb5a91c63f9062802a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pysetuptools postgresql" -- cgit v1.2.3