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

[mnogosearch-rpm] / mnogosearch.spec

diff --git a/mnogosearch.spec b/mnogosearch.spec
index 3e64967..fc5b99d 100644 (file)
--- a/mnogosearch.spec
+++ b/mnogosearch.spec
@@ -11,7 +11,7 @@
 Summary:        Web indexing and search system for a small domain or intranet
 Name:           mnogosearch
 Version:        3.3.11
-Release:        2
+Release:        3
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://www.mnogosearch.org/
@@ -23,6 +23,13 @@ Source1:        mnogosearch-reindex
 Source2:        mnogosearch.crond
 Source3:        httpd.conf
 
+# makes adapting the configuration more easy, taken from upstream cvs
+Patch0:         mnogosearch-3.3.11-prepare-config.patch
+
+# modify the default configuration suitable for our distribution
+# distribution-specific, not upstream
+Patch1:         mnogosearch-distconfig.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       %{name}-libs = %{version}-%{release}
@@ -30,6 +37,7 @@ Requires:       /usr/bin/wvHtml
 Requires:       /usr/bin/xlhtml
 Requires:       /usr/bin/ppthtml
 Requires:       /usr/bin/pdftotext
+Requires:       /usr/bin/unrtf
 Requires(pre):  shadow-utils
 
 # user "apache" is added to mnogosearch group so we need the user to be present
@@ -109,6 +117,9 @@ This package contains the PHP extension for %{name}
 %prep
 %setup -q -n mnogosearch-%{version}
 
+%patch0 -p1
+%patch1 -p1
+
 %build
 autoreconf -fi
 
@@ -155,45 +166,6 @@ for f in *-dist ; do
 done
 )
 
-# fix header of config file
-sed -i 's|/usr/local/mnogosearch/sbin/indexer|%{_bindir}/indexer|g' \
-    %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf
-
-# change default configuration
-sed -i 's|DBAddr.mysql://root@localhost/test/?dbmode=blob|DBAddr sqlite3://localhost/%{_localstatedir}/lib/mnogosearch/default.db/?dbmode=blob|g' \
-    %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf \
-    %{buildroot}%{_sysconfdir}/mnogosearch/search.htm \
-
-sed -i 's|#LocalCharset UTF-8|LocalCharset UTF-8|g' \
-    %{buildroot}%{_sysconfdir}/mnogosearch/indexer.conf
-
-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/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' \
-    %{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
-
-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/
@@ -336,6 +308,11 @@ service httpd condrestart > /dev/null 2>&1 || :
 %{php_extdir}
 
 %changelog
+* Mon Jan 31 2011 Gerd v. Egidy <gerd@egidy.de> 3.3.11-3
+- include upstream-patch to make adapting the config more easy
+- add unrtf to default config and requires
+- modifying the default configuration now done with a patch
+
 * 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: