From: Gerd von Egidy Date: Thu, 27 Jan 2011 18:25:56 +0000 (+0100) Subject: - use wvHtml instead of catdoc by default: it retains formatting X-Git-Url: http://developer.intra2net.com/git/?p=mnogosearch-rpm;a=commitdiff_plain;h=7aeead928a3be2854aa93a89c4018e55af93aacc - use wvHtml instead of catdoc by default: it retains formatting - don't disable the file types we now have helpers for --- diff --git a/mnogosearch-3.3.11-2.src.rpm b/mnogosearch-3.3.11-2.src.rpm index 539557c..eed4c29 100644 Binary files a/mnogosearch-3.3.11-2.src.rpm and b/mnogosearch-3.3.11-2.src.rpm differ diff --git a/mnogosearch.spec b/mnogosearch.spec index 65363eb..3e64967 100644 --- a/mnogosearch.spec +++ b/mnogosearch.spec @@ -26,7 +26,7 @@ Source3: httpd.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} -Requires: /usr/bin/catdoc +Requires: /usr/bin/wvHtml Requires: /usr/bin/xlhtml Requires: /usr/bin/ppthtml Requires: /usr/bin/pdftotext @@ -173,7 +173,7 @@ sed -i 's|#Server http://localhost/|Server http://localhost/|g' \ # enable common external document helpers by default # we require them so they will be installed -sed -i 's|#Mime application/msword "text/plain; charset=utf-8" "catdoc -a -dutf-8 $1"|Mime application/msword "text/plain; charset=utf-8" "catdoc -a -dutf-8 $1"|g' \ +sed -i 's|#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 -"|g' \ %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf sed -i 's|#Mime application/pdf text/plain "pdftotext $1 -"|Mime application/pdf text/plain "pdftotext $1 -"|g' \ @@ -185,6 +185,15 @@ sed -i 's|#Mime application/vnd.ms-excel text/html "xlhtml $1"| sed -i 's|#Mime application/vnd.ms-powerpoint text/html "ppthtml $1"|Mime application/vnd.ms-powerpoint text/html "ppthtml $1"|g' \ %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf +sed -i 's|Disallow \*.tex \*.texi \*.xls \*.doc \*.texinfo|Disallow *.tex *.texi *.texinfo|g' \ + %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf + +sed -i 's|Disallow \*.rtf \*.pdf \*.cdf \*.ps|Disallow *.rtf *.cdf *.ps|g' \ + %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf + +sed -i 's|Disallow \*.ai \*.eps \*.ppt \*.hqx|Disallow *.ai *.eps *.hqx|g' \ + %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf + # the cgi is no regular binary, move it to libexec install -d %{buildroot}%{_libexecdir}/mnogosearch mv -f %{buildroot}%{_bindir}/*.cgi %{buildroot}%{_libexecdir}/mnogosearch/ @@ -332,6 +341,8 @@ service httpd condrestart > /dev/null 2>&1 || : - enable some external document helpers by default: we always have them because of requires - require the binaries of the helpers used, not the package names +- use wvHtml instead of catdoc by default: it retains formatting +- don't disable the file types we now have helpers for * Thu Jan 27 2011 Gerd v. Egidy 3.3.11-1 - mnogosearch 3.3.11