misc/xapian-omega: Updated for version 1.2.8.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

5 files changed, 17 insertions, 23 deletions

diff --git a/misc/xapian-omega/README b/misc/xapian-omega/README
index f69d94d64a..4ca89f3a85 100644
--- a/misc/xapian-omega/README
+++ b/misc/xapian-omega/README
@@ -2,7 +2,3 @@ Omega is an application built on Xapian, consisting
 of indexers and a CGI search frontend.
 
 This requires xapian-core.
-
-After installing xapian-omega, you will need to:
-1. See /var/lib/xapian-omega/templates/README
-2. Set up /usr/lib(64)/xapian-omega/bin/omega as an httpd cgi executable.
diff --git a/misc/xapian-omega/slack-desc b/misc/xapian-omega/slack-desc
index 3da83b63cc..4b0b44728d 100644
--- a/misc/xapian-omega/slack-desc
+++ b/misc/xapian-omega/slack-desc
@@ -13,7 +13,7 @@ xapian-omega: library to index and search collections of documents.
 xapian-omega:
 xapian-omega: Homepage: http://www.xapian.org/
 xapian-omega:
-xapian-omega:
-xapian-omega:
-xapian-omega:
+xapian-omega: The default configuration file is /etc/xapian-omega.conf. This differs
+xapian-omega: from the upstream Xapian Omega default of /etc/omega.conf to avoid
+xapian-omega: clashing with other applications that use /etc/omega.conf.
 xapian-omega:
diff --git a/misc/xapian-omega/use_xapian-omega.conf_for_configfile.patch b/misc/xapian-omega/use_xapian-omega.conf_for_configfile.patch
index d6b01f316a..8426102bce 100644
--- a/misc/xapian-omega/use_xapian-omega.conf_for_configfile.patch
+++ b/misc/xapian-omega/use_xapian-omega.conf_for_configfile.patch
@@ -1,7 +1,7 @@
-diff -Nur xapian-omega-1.2.4.orig//Makefile.in xapian-omega-1.2.4/Makefile.in
---- xapian-omega-1.2.4.orig//Makefile.in	2010-12-19 06:54:47.000000000 -0600
-+++ xapian-omega-1.2.4/Makefile.in	2011-01-16 14:19:55.516062731 -0600
-@@ -411,7 +411,7 @@
+diff -Nur xapian-omega-1.2.8.orig/Makefile.in xapian-omega-1.2.8/Makefile.in
+--- xapian-omega-1.2.8.orig/Makefile.in	2011-12-14 11:04:48.000000000 +0530
++++ xapian-omega-1.2.8/Makefile.in	2012-01-18 19:30:25.686917983 +0530
+@@ -420,7 +420,7 @@
  	xapian-omega.spec
  
  AM_CPPFLAGS = \
diff --git a/misc/xapian-omega/xapian-omega.SlackBuild b/misc/xapian-omega/xapian-omega.SlackBuild
index 3893f251c5..57dca38c69 100644
--- a/misc/xapian-omega/xapian-omega.SlackBuild
+++ b/misc/xapian-omega/xapian-omega.SlackBuild
@@ -22,13 +22,16 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
-# Quite modified by Robby Workman <rworkman@slackbuilds.org>
+# Based on 1.2.4 version on which Robby Workman <rworkman@slackbuilds.org>
+# gave much help
 
 PRGNAM=xapian-omega
-VERSION=${VERSION:-1.2.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+HTTPD_DIR=${HTTPD_DIR:-/srv/httpd}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -98,10 +101,6 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 rm -f $PKG/etc/omega.conf 
 cat $CWD/xapian-omega.conf > $PKG/etc/xapian-omega.conf.new
 
-# This Vim syntax file is nice to have
-mkdir -p $PKG/usr/share/vim/vim72/syntax
-cp -a extra/omegascript.vim $PKG/usr/share/vim/vim72/syntax
-
 # Create the otherwise missing directories listed in /etc/xapian-omega.conf
 mkdir -p $PKG/var/lib/xapian-omega/{cdb,data} $PKG/var/log/xapian-omega
 
@@ -116,7 +115,6 @@ cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-ln -s /var/lib/xapian-omega/templates/README $PKG/usr/doc/$PRGNAM-$VERSION/README.templates
 
 # Adjustments to harmonise with the Debian package created by Xapian developer Olly
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
diff --git a/misc/xapian-omega/xapian-omega.info b/misc/xapian-omega/xapian-omega.info
index f8259b9bc9..659713d9bc 100644
--- a/misc/xapian-omega/xapian-omega.info
+++ b/misc/xapian-omega/xapian-omega.info
@@ -1,10 +1,10 @@
 PRGNAM="xapian-omega"
-VERSION="1.2.4"
+VERSION="1.2.8"
 HOMEPAGE="http://www.xapian.org/"
-DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.4/xapian-omega-1.2.4.tar.gz"
-MD5SUM="b20262101ffbd4aec457a34241834a72"
+DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.8/xapian-omega-1.2.8.tar.gz"
+MD5SUM="cdacd33e0054ccfc8572f284022c4fe6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Charles"
 EMAIL="SlackBuilds@catcons.co.uk"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"