desktop/recoll: Updated for version 1.11.4

4 files changed, 41 insertions, 23 deletions

diff --git a/desktop/recoll/README b/desktop/recoll/README
index d27913a02c..f49a6d8e01 100644
--- a/desktop/recoll/README
+++ b/desktop/recoll/README
@@ -1,12 +1,8 @@
-recoll (personal full text search tool)
-
-Recoll is a personal full text search tool for Unix/Linux.  It is based
-on the very strong Xapian backend, for which it provides an easy to use, 
-feature-rich, easy administration, QT graphical interface.
+Recoll is a personal full text search tool for Unix/Linux.
+It is based on the very strong Xapian backend, for which it 
+provides an easy to use, feature-rich, easy administration, 
+QT graphical interface. Recoll is able to include several separate 
+folders ("Top directories") in its search.
 
 This requires xapian-core, with optional dependencies of antiword, unrtf,
 and exiftool (all available at SlackBuilds.org).
-
-This version has the ability to define the folders that shall be
-indexed from within the program's GUI. Manually editing the config files
-should no longer be necessary.
diff --git a/desktop/recoll/doinst.sh b/desktop/recoll/doinst.sh
new file mode 100644
index 0000000000..1f8ff67ded
--- /dev/null
+++ b/desktop/recoll/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/desktop/recoll/recoll.SlackBuild b/desktop/recoll/recoll.SlackBuild
index b41eb3e248..31e7d51d67 100644
--- a/desktop/recoll/recoll.SlackBuild
+++ b/desktop/recoll/recoll.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for recoll
-# Copyright 2007 by titopoquito (titopoquito@cooltoad.com)
+
+# Copyright 2007-2009 by titopoquito (titopoquito@gmail.com)
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
 #   the above copyright notice and this permission notice appear in all
@@ -19,12 +20,11 @@
 #   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
-# ---------------------------------------------------------------------------
 
 # Modified by the SlackBuilds.org Project
 
 PRGNAM=recoll
-VERSION=1.10.1
+VERSION=1.11.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,17 +36,22 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -55,15 +60,20 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
-  --localstatedir=/var
+  --mandir=/usr/man \
+  --localstatedir=/var \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -71,11 +81,14 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog COPYING INSTALL README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ChangeLog COPYING INSTALL README VERSION \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/desktop/recoll/recoll.info b/desktop/recoll/recoll.info
index 85adf9a674..0947000bf1 100644
--- a/desktop/recoll/recoll.info
+++ b/desktop/recoll/recoll.info
@@ -1,8 +1,7 @@
 PRGNAM="recoll"
-VERSION="1.10.1"
+VERSION="1.11.4"
 HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-DOWNLOAD="http://www.lesbonscomptes.com/recoll/recoll-1.10.1.tar.gz"
-MD5SUM="307abae987bf4fc40ef3ec1899d49995"
+DOWNLOAD="http://www.lesbonscomptes.com/recoll/recoll-1.11.4.tar.gz"
+MD5SUM="3a7bdf9317814288e922707209943578"
 MAINTAINER="titopoquito"
-EMAIL="titopoquito@cooltoad.com"
-APPROVED="David Somero"
+EMAIL="titopoquito@gmail.com"