- 3.2.40

[packages/mnogosearch.git] / mnogosearch.spec

diff --git a/mnogosearch.spec b/mnogosearch.spec
index 801a7f935d188adbccfc37eb641d5a7320625ff3..dcdb72484b8912af6a47d6a2493b5ecf3cec4257 100644 (file)
--- a/mnogosearch.spec
+++ b/mnogosearch.spec
@@ -16,15 +16,16 @@
 Summary:       Another one web indexing and searching system for a small domain or intranet
 Summary(pl):   Kolejny system indeksowania i przeszukiwania WWW dla ma³ych domen i intranetu
 Name:          mnogosearch
-Version:       3.2.32
-Release:       5
+Version:       3.2.40
+Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 #Source0Download: http://www.mnogosearch.ru/download.html
 Source0:       http://www.mnogosearch.ru/Download/%{name}-%{version}.tar.gz
-# Source0-md5: c244702ad4bc95bacf7b06ac1327b159
+# Source0-md5: 80515ca73111a1ac66fc496646beb39e
 Source1:       %{name}-dbgen
 Patch0:                %{name}-acfixes.patch
+Patch1:                %{name}-as_needed-fix.patch
 URL:           http://www.mnogosearch.ru/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -38,9 +39,9 @@ BuildRequires:        libtool
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 %{?with_unixodbc:BuildRequires:        unixODBC-devel}
 BuildRequires: zlib-devel
-PreReq:                webserver
-#%{?with_pgsql:PreReq:         postgresql-clients}
 Requires:      %{name}-lib = %{version}-%{release}
+#%{?with_pgsql:Requires: postgresql-clients}
+Requires:      webserver
 Obsoletes:     aspseek
 Obsoletes:     mnogosearch-stored
 Obsoletes:     udmsearch
@@ -82,13 +83,14 @@ dla ma
 wielki system typu Lycos, Infoseek WebCrawler i AltaVista. Natomiast
 nadaje siê do zastosowania w pojedynczej firmie, kampusie lub
 jakiejkolwiek stronie WWW. Zalety:
-- przeszukiwanie tagów MP3,
+- przeszukiwanie znaczników MP3,
 - niusów (Server news://localhost/pl/),
 - htdb czyli baz danych udostêpnianych przez WWW/CGI. (HTDBList SELECT
   \ concat("http://search.mnogo.ru/board/message.php?id=",id) \ FROM
   udm.messages LIMIT 2))
 - zawarto¶ci serwerów FTP (rada za 2gr: "Index no" dla serwera FTP
-  spowoduje nie indeksowanie *zawarto¶ci* plików na nim siê znajduj±cych)
+  spowoduje nie indeksowanie *zawarto¶ci* plików na nim siê
+  znajduj±cych)
 - wyszukiwanie w zwyk³ych URL-ach http://
 - wsparcie dla SSL (https://)
 - wyszukiwanie w mirrorach (równie¿ lokalnych) odleg³ych sieci
@@ -124,6 +126,7 @@ Summary(pl):        Pliki nag
 Group:         Development/Libraries
 Requires:      %{name}-lib = %{version}-%{release}
 %{?with_expat:Requires:        expat-devel}
+%{?with_freetds:Requires:      freetds-devel}
 %{?with_iodbc:Requires:        libiodbc-devel}
 %{?with_mysql:Requires:        mysql-devel}
 %{?with_ssl:Requires:  openssl-devel}
@@ -151,12 +154,13 @@ Ten pakiet zawiera statyczne biblioteki mnogosearch.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 find . -type d -name CVS | xargs rm -rf
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I build/m4
 %{__autoconf}
 %{__automake}
 %configure \
@@ -194,15 +198,15 @@ find . -type d -name CVS | xargs rm -rf
 #  enable automatic Russian charset guesser :-]
 # wy uze www.linux.ru procitacli sewodnja?
 
-#  --with-solid[=DIR]      Include Solid support.  DIR is the Solid base
+#  --with-solid[=DIR]    Include Solid support.  DIR is the Solid base
 #  --with-openlink[=DIR]   Include OpenLink ODBC support.
 #  --with-easysoft[=DIR]   Include EasySoft ODBC support.
-#  --with-sapdb[=DIR]      Include SAPDB support.  DIR is the SAPDB base
-#  --with-ibase[=DIR]      Include InterBase support.  DIR is the InterBase
-#  --with-ctlib[=DIR]      Include Ct-Lib support.
-#  --with-freetds[=DIR]    Include FreeTDS Ct-Lib support.
-#  --with-oracle7[=DIR]    Include Oracle 7.3 support.  DIR is the Oracle
-#  --with-oracle8[=DIR]    Include Oracle8 support.  DIR is the Oracle
+#  --with-sapdb[=DIR]    Include SAPDB support.  DIR is the SAPDB base
+#  --with-ibase[=DIR]    Include InterBase support.  DIR is the InterBase
+#  --with-ctlib[=DIR]    Include Ct-Lib support.
+#  --with-freetds[=DIR]        Include FreeTDS Ct-Lib support.
+#  --with-oracle7[=DIR]        Include Oracle 7.3 support.  DIR is the Oracle
+#  --with-oracle8[=DIR]        Include Oracle8 support.  DIR is the Oracle
 #  --with-oracle8i[=DIR]   Include Oracle8i support.  DIR is the Oracle
 #
 # FIXME: add selection of storage method, spliting into %{name}-common & %{name}-$DB_NAME
@@ -216,13 +220,12 @@ install -d $RPM_BUILD_ROOT{%{_localstatedir},%{htmldir},%{cgidir},%{_sysconfdir}
        DESTDIR=$RPM_BUILD_ROOT \
        doc_FILES='$(HTML_ALL)'
 
-ln -sf %{_defaultdocdir}/%{name}-%{version}/html \
+ln -sf %{_docdir}/%{name}-%{version}/html \
        $RPM_BUILD_ROOT%{htmldir}/mnogodoc
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/*.cgi \
        $RPM_BUILD_ROOT%{cgidir}
 
-install -d $RPM_BUILD_ROOT/usr/src/example/mnogosearch
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily/mnogosearch-dbgen
 
 mkdir html
@@ -241,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 cat << EOF
-Please see docs (%{_defaultdocdir}/%{name}-%{version}),
+Please see docs (%{_docdir}/%{name}-%{version}),
 then read how to setup db connection, and put line like this
 "pgsql://user:password@/dbname/" into %{_sysconfdir}, then setup database
 using "indexer -Ecreate" command.