From 679f06bfd735b138a0083d1f5eb0a33324765c52 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 19 May 2007 00:15:56 +0000 Subject: Reverted to 0.9.10 plus a patch... need this for recoll --- xapian-core/build/xapian-core.SlackBuild | 38 +++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'xapian-core') diff --git a/xapian-core/build/xapian-core.SlackBuild b/xapian-core/build/xapian-core.SlackBuild index c97f917e..477b7722 100755 --- a/xapian-core/build/xapian-core.SlackBuild +++ b/xapian-core/build/xapian-core.SlackBuild @@ -30,7 +30,7 @@ # URL: http://www.xapian.org/ # Needs: # Changelog: -# 1.0.0-1: 18/May/2007 by Eric Hameleers +# 0.9.10-1: 18/May/2007 by Eric Hameleers # * Initial build. # # Run 'sh xapian-core.SlackBuild --cleanup' to build a Slackware package. @@ -41,7 +41,7 @@ # Set initial variables: PRGNAM=xapian-core -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-0.9.10} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} @@ -59,7 +59,11 @@ OUTPUT=${OUTPUT:-/tmp} # Input URL: http://www.oligarchy.co.uk/xapian/1.0.0/xapian-core-1.0.0.tar.gz SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" -SRCURL="http://www.oligarchy.co.uk/${PRGNAM}/${VERSION}/${PRGNAM}-core-${VERSION}.tar.gz" +SRCURL="http://www.oligarchy.co.uk/xapian/${VERSION}/${PRGNAM}-${VERSION}.tar.gz" + +# recoll needs this patch: +PATCH="$SRCDIR/xapNearDistrib.patch" +PATCHURL="http://www.recoll.org/xapian/xapNearDistrib.patch" ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -140,6 +144,24 @@ if ! [ -f ${SOURCE} ]; then fi fi +if ! [ -f ${PATCH} ]; then + if ! [ "x${PATCHURL}" == "x" ]; then + # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT + [ -w "$SRCDIR" ] || PATCH="$OUTPUT/`basename $PATCH`" + echo "Source '`basename ${PATCH}`' not available yet..." + echo "Will download file to `dirname $PATCH`" + wget -nv -O "${PATCH}" "${PATCHURL}" || true + if [ $? -ne 0 ]; then + echo "Downloading '`basename ${PATCH}`' failed... aborting the build." + mv -f "${PATCH}" "${PATCH}".FAIL + exit 1 + fi + else + echo "File '`basename ${PATCH}`' not available... aborting the build." + exit 1 + fi +fi + if [ "$P1" == "--download" ]; then echo "Download complete." exit 0 @@ -161,6 +183,9 @@ fi chown -R root:root * chmod -R u+w,go+r-w,a-s * cd ${PRGNAM}-${VERSION} +( cd api + patch -p0 < $PATCH 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log +) echo Building ... LDFLAGS="$SLKLDFLAGS" \ @@ -171,6 +196,8 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --datarootdir=/usr \ --datadir=/usr/share \ + --docdir=/usr/doc/$PRGNAM \ + --disable-static \ --program-prefix="" \ --program-suffix="" \ --build=$ARCH-slackware-linux \ @@ -193,6 +220,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* +# Work around a bug in configure for version < 1.1.0: +if [ -d $PKG/usr/share/doc/$PRGNAM ]; then + mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/ + rmdir $PKG/usr/share/doc +fi # Remove unwanted API documentation: # If you _do_ want the API docs, just uncomment the next line: #mv $PKG/usr/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/ -- cgit v1.2.3-79-gdb01