- include upstream-patch to make adapting the config more easy

[mnogosearch-rpm] / mnogosearch-distconfig.patch

diff --git a/mnogosearch-distconfig.patch b/mnogosearch-distconfig.patch
new file mode 100644 (file)
index 0000000..a35443a
--- /dev/null
+++ b/mnogosearch-distconfig.patch
@@ -0,0 +1,116 @@
+diff -r -u mnogosearch-3.3.11.orig/etc/indexer.conf-dist mnogosearch-3.3.11/etc/indexer.conf-dist
+--- mnogosearch-3.3.11.orig/etc/indexer.conf-dist      2011-01-31 11:06:27.000000000 +0100
++++ mnogosearch-3.3.11/etc/indexer.conf-dist   2011-01-31 11:15:30.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/mnogosearch/sbin/indexer -d
++#!/usr/bin/indexer -d
+ 
+ ###########################################################################
+ # This is a sample indexer config file.
+@@ -49,7 +49,7 @@
+ # then PostgreSQL will not work via TCP, but will use Unix socket.
+ #
+ 
+-DBAddr        mysql://root@localhost/test/?dbmode=blob
++DBAddr sqlite3://localhost/var/lib/mnogosearch/default.db/?dbmode=blob
+ 
+ 
+ 
+@@ -139,7 +139,7 @@
+ #LocalCharset Shift-JIS
+ 
+ # Full UNICODE
+-#LocalCharset UTF-8
++LocalCharset UTF-8
+ 
+ #######################################################################
+ #ForceIISCharset1251 yes/no
+@@ -169,7 +169,7 @@
+ #
+ #StopwordFile stopwords/en.sl
+ 
+-#Include stopwords.conf
++Include stopwords.conf
+ 
+ 
+ ###########################################################################
+@@ -180,7 +180,7 @@
+ #
+ #LangMapFile langmap/en.ascii.lm
+ 
+-#Include langmap.conf
++Include langmap.conf
+ 
+ 
+ #######################################################################
+@@ -310,11 +310,11 @@
+ 
+ # Disallow document extensions that are not understood by default.
+ # Comment these lines if you have corresponding external parsers.
+-Disallow *.rtf
+-Disallow *.doc
+-Disallow *.xls
+-Disallow *.ppt
+-Disallow *.pdf
++#Disallow *.rtf
++#Disallow *.doc
++#Disallow *.xls
++#Disallow *.ppt
++#Disallow *.pdf
+ 
+ # Exclude some known extensions using fast "String" match:
+ Disallow *.b    *.sh   *.md5  *.rpm
+@@ -531,16 +531,16 @@
+ #       from_mime                to_mime[charset]             [command line [$1]]
+ #
+ #Mime application/msword      "text/plain; charset=utf-8" "catdoc -a -dutf-8 $1"
+-#Mime application/msword      "text/html; charset=utf-8"  "wvHtml --charset=utf-8 $1 -"
++Mime application/msword       "text/html; charset=utf-8"  "wvHtml --charset=utf-8 $1 -"
+ #Mime application/x-troff-man  text/plain                 "deroff"
+ #Mime text/x-postscript        text/plain                 "ps2ascii"
+-#Mime application/pdf          text/plain                 "pdftotext $1 -"
++Mime application/pdf          "text/plain; charset=utf-8" "pdftotext $1 -"
+ #Mime application/vnd.ms-excel text/plain                 "xls2csv $1"
+-#Mime application/vnd.ms-excel text/html                  "xlhtml $1"
++Mime application/vnd.ms-excel "text/html; charset=utf-8"  "xlhtml $1"
+ #Mime "text/rtf*"              text/html                  "rthc --use-stdout $1 2>/dev/null"
+ #Mime "text/rtf*"              text/xml                   "rtfx -w $1 2>/dev/null"
+-#Mime "text/rtf*"              text/html                  "unrtf --html $1"
+-#Mime application/vnd.ms-powerpoint "text/html; charset=utf-8" "pptohtml $1"
++Mime "text/rtf*"              "text/html; charset=utf-8"  "unrtf --html $1"
++Mime application/vnd.ms-powerpoint "text/html; charset=utf-8" "ppthtml $1"
+ #Mime application/vnd.ms-powerpoint text/html             "ppthtml $1"
+ 
+ 
+@@ -975,7 +975,7 @@
+ # Default value is "path".
+ #
+ # To index whole server "localhost":
+-#Server http://localhost/
++Server http://localhost/
+ #
+ # You can also specify some path to index subdirectory only:
+ #Server http://localhost/subdir/
+diff -r -u mnogosearch-3.3.11.orig/etc/search.htm-dist mnogosearch-3.3.11/etc/search.htm-dist
+--- mnogosearch-3.3.11.orig/etc/search.htm-dist        2011-01-27 16:10:07.000000000 +0100
++++ mnogosearch-3.3.11/etc/search.htm-dist     2011-01-31 11:17:04.000000000 +0100
+@@ -13,7 +13,7 @@
+ <!--variables
+ # Database parameters
+ # Format: <DBType>:[//[DBUser[:DBPass]@]DBHost[:DBPort]]/DBName/[?dbmode=mode]
+-DBAddr        mysql://root@localhost/test/?dbmode=blob
++DBAddr sqlite3://localhost/var/lib/mnogosearch/default.db/?dbmode=blob
+ 
+ # Uncomment this line to enable search result cache
+ #Cache yes
+@@ -25,8 +25,8 @@
+ # Default charset is iso-8859-1 (latin1)
+ # which is suitable for the most Western European languages
+ 
+-LocalCharset   iso-8859-1
+-BrowserCharset iso-8859-1
++LocalCharset   utf-8
++BrowserCharset utf-8
+ 
+ # Load stopwords file.  File name is either absolute
+ # or relative to /etc directory of mnoGoSearch installation.