From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Thu, 27 Jan 2011 18:05:42 +0000 (+0100)
Subject: - last minute-changes in the 3.3.11 release
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=ba649e5505bbbafad62093e44849e871261b2aff;p=mnogosearch-rpm

- last minute-changes in the 3.3.11 release
- 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
---

diff --git a/mnogosearch-3.3.11-1.src.rpm b/mnogosearch-3.3.11-1.src.rpm
deleted file mode 100644
index 57b987c..0000000
Binary files a/mnogosearch-3.3.11-1.src.rpm and /dev/null differ
diff --git a/mnogosearch-3.3.11-2.src.rpm b/mnogosearch-3.3.11-2.src.rpm
new file mode 100644
index 0000000..539557c
Binary files /dev/null and b/mnogosearch-3.3.11-2.src.rpm differ
diff --git a/mnogosearch-3.3.11.tar.gz b/mnogosearch-3.3.11.tar.gz
index 0868dc6..c297a4f 100644
Binary files a/mnogosearch-3.3.11.tar.gz and b/mnogosearch-3.3.11.tar.gz differ
diff --git a/mnogosearch.spec b/mnogosearch.spec
index 9a9eda6..65363eb 100644
--- a/mnogosearch.spec
+++ b/mnogosearch.spec
@@ -11,12 +11,12 @@
 Summary:        Web indexing and search system for a small domain or intranet
 Name:           mnogosearch
 Version:        3.3.11
-Release:        1
+Release:        2
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://www.mnogosearch.org/
 
-# md5sum 67f5437170c8eef89b393a640890c0cc
+# md5sum 906d5e1e21ba00024574f57548d32029
 Source0:        http://www.mnogosearch.org/Download/mnogosearch-%{version}.tar.gz
 
 Source1:        mnogosearch-reindex
@@ -26,8 +26,10 @@ Source3:        httpd.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       %{name}-libs = %{version}-%{release}
-Requires:       catdoc
-Requires:       xlhtml
+Requires:       /usr/bin/catdoc
+Requires:       /usr/bin/xlhtml
+Requires:       /usr/bin/ppthtml
+Requires:       /usr/bin/pdftotext
 Requires(pre):  shadow-utils
 
 # user "apache" is added to mnogosearch group so we need the user to be present
@@ -168,6 +170,21 @@ sed -i 's|#LocalCharset UTF-8|LocalCharset UTF-8|g' \
 sed -i 's|#Server http://localhost/|Server http://localhost/|g' \
     %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf
 
+# 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' \
+    %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf
+
+sed -i 's|#Mime application/pdf          text/plain                 "pdftotext $1 -"|Mime application/pdf          text/plain                 "pdftotext $1 -"|g' \
+    %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf
+
+sed -i 's|#Mime application/vnd.ms-excel text/html                  "xlhtml $1"|Mime application/vnd.ms-excel text/html                  "xlhtml $1"|g' \
+    %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf
+
+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
+
 # the cgi is no regular binary, move it to libexec
 install -d %{buildroot}%{_libexecdir}/mnogosearch
 mv -f %{buildroot}%{_bindir}/*.cgi %{buildroot}%{_libexecdir}/mnogosearch/
@@ -310,6 +327,12 @@ service httpd condrestart > /dev/null 2>&1 || :
 %{php_extdir}
 
 %changelog
+* Thu Jan 27 2011 Gerd v. Egidy <gerd@egidy.de> 3.3.11-2
+- last minute-changes in the 3.3.11 release
+- 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
+
 * Thu Jan 27 2011 Gerd v. Egidy <gerd@egidy.de> 3.3.11-1
 - mnogosearch 3.3.11
 - unit testing with two databases