diff options
| -rw-r--r-- | misc/xapian-omega/slack-desc | 4 | ||||
| -rw-r--r-- | misc/xapian-omega/use_xapian-omega.conf_for_configfile.patch | 12 | ||||
| -rw-r--r-- | misc/xapian-omega/xapian-omega.SlackBuild | 6 | ||||
| -rw-r--r-- | misc/xapian-omega/xapian-omega.info | 6 |
4 files changed, 8 insertions, 20 deletions
diff --git a/misc/xapian-omega/slack-desc b/misc/xapian-omega/slack-desc index 4b0b44728d..bf64428073 100644 --- a/misc/xapian-omega/slack-desc +++ b/misc/xapian-omega/slack-desc @@ -11,9 +11,9 @@ xapian-omega: xapian-omega: Omega is a CGI application which uses the Xapian Information Retrieval xapian-omega: library to index and search collections of documents. xapian-omega: -xapian-omega: Homepage: http://www.xapian.org/ -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: +xapian-omega: Homepage: http://www.xapian.org/ +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 deleted file mode 100644 index 8426102bce..0000000000 --- a/misc/xapian-omega/use_xapian-omega.conf_for_configfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 = \ -- -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \ -+ -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/xapian-omega.conf\" \ - -DPKGLIBBINDIR=\"$(pkglibbindir)\" - - pkglibbindir = $(pkglibdir)/bin diff --git a/misc/xapian-omega/xapian-omega.SlackBuild b/misc/xapian-omega/xapian-omega.SlackBuild index 57dca38c69..55b2557855 100644 --- a/misc/xapian-omega/xapian-omega.SlackBuild +++ b/misc/xapian-omega/xapian-omega.SlackBuild @@ -26,7 +26,7 @@ # gave much help PRGNAM=xapian-omega -VERSION=${VERSION:-1.2.8} +VERSION=${VERSION:-1.2.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,8 +74,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Use /etc/xapian-omega.conf for the config file -patch -p1 < $CWD/use_xapian-omega.conf_for_configfile.patch +# Use xapian-omega.conf for the config file +sed -i 's|/omega.conf\\"|/xapian-omega.conf\\"|' Makefile.in CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/misc/xapian-omega/xapian-omega.info b/misc/xapian-omega/xapian-omega.info index ea5b8bfaf7..67b5241611 100644 --- a/misc/xapian-omega/xapian-omega.info +++ b/misc/xapian-omega/xapian-omega.info @@ -1,8 +1,8 @@ PRGNAM="xapian-omega" -VERSION="1.2.8" +VERSION="1.2.12" HOMEPAGE="http://www.xapian.org/" -DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.8/xapian-omega-1.2.8.tar.gz" -MD5SUM="cdacd33e0054ccfc8572f284022c4fe6" +DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.12/xapian-omega-1.2.12.tar.gz" +MD5SUM="7eed3c1e9e6acb703d6587ed9a038265" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xapian-core" |