packages: dokuwiki-plugin-sphinxsearch/dokuwiki-plugin-sphinxsearch.spec, d...

[glen]

Author: glen                         Date: Tue Nov  2 08:52:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system sphinx package (pecl or phpapi)

---- Files affected:
packages/dokuwiki-plugin-sphinxsearch:
   dokuwiki-plugin-sphinxsearch.spec (1.1 -> 1.2) , sphinxapi-pecl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-sphinxsearch/dokuwiki-plugin-sphinxsearch.spec
diff -u packages/dokuwiki-plugin-sphinxsearch/dokuwiki-plugin-sphinxsearch.spec:1.1 packages/dokuwiki-plugin-sphinxsearch/dokuwiki-plugin-sphinxsearch.spec:1.2
--- packages/dokuwiki-plugin-sphinxsearch/dokuwiki-plugin-sphinxsearch.spec:1.1	Tue Nov  2 09:48:21 2010
+++ packages/dokuwiki-plugin-sphinxsearch/dokuwiki-plugin-sphinxsearch.spec	Tue Nov  2 09:51:59 2010
@@ -4,16 +4,16 @@
 Summary(pl.UTF-8):	Wtyczka sphinxsearch dla DokuWiki
 Name:		dokuwiki-plugin-%{plugin}
 Version:	0.3.3
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://launchpad.net/dokuwiki-sphinxsearch/0.3/%{version}/+download/sphinxsearch-%{version}.tar.gz
 # Source0-md5:	07448f7d6639431f44013708e577f45d
+Patch0:		sphinxapi-pecl.patch
 URL:		http://www.dokuwiki.org/plugin:sphinxsearch
 BuildRequires:	rpmbuild(macros) >= 1.520
-# for %%undos macro
-BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	dokuwiki >= 20091225
+Requires:	php(sphinx)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,13 +26,11 @@
 functionality with the Sphinx Search Engine powered search which gives
 high-performance and more relevant search results.
 
-Features
-
+Features:
 - Google-style results (Results are shown in traditional Google-style:
   title, snippet and address (document path).)
 - Filtering by namespaces (Click on namespaces in the results to see
-  search only within chosen namespace, or simply use “ “search phrase
-  @ns personal:mike:travel”)
+  search only within chosen namespace
 - Document sections are indexed separately (This is very useful for
   those who have large pages in DokuWiki)
 
@@ -41,6 +39,10 @@
 mv %{plugin}/* .
 rm %{plugin}/.hg_archival.txt
 rm %{plugin}/.htaccess
+%patch0 -p1
+
+# use system pkg
+rm sphinxapi.php
 
 version=$(awk '/date/{print $2}' plugin.info.txt)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
@@ -72,5 +74,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/11/02 08:51:59  glen
+- use system sphinx package (pecl or phpapi)
+
 Revision 1.1  2010/11/02 08:48:21  glen
 - initial

================================================================
Index: packages/dokuwiki-plugin-sphinxsearch/sphinxapi-pecl.patch
diff -u /dev/null packages/dokuwiki-plugin-sphinxsearch/sphinxapi-pecl.patch:1.1
--- /dev/null	Tue Nov  2 09:52:04 2010
+++ packages/dokuwiki-plugin-sphinxsearch/sphinxapi-pecl.patch	Tue Nov  2 09:51:59 2010
@@ -0,0 +1,17 @@
+--- sphinxsearch/action.php~	2010-10-29 10:26:51.000000000 +0300
++++ sphinxsearch/action.php	2010-11-02 10:49:40.942111150 +0200
+@@ -10,8 +10,13 @@
+ 
+ require_once(DOKU_INC.'inc/parser/parser.php');
+ 
++// No pecl class, try php version
++if (!class_exists('SphinxClient')) {
++	// loads from php include_path
++	require_once 'sphinxapi.php';
++}
++
+ require_once(DOKU_PLUGIN . 'action.php');
+-require_once(DOKU_PLUGIN . 'sphinxsearch/sphinxapi.php');
+ require_once(DOKU_PLUGIN . 'sphinxsearch/PageMapper.php');
+ require_once(DOKU_PLUGIN . 'sphinxsearch/SphinxSearch.php');
+ require_once(DOKU_PLUGIN . 'sphinxsearch/functions.php');
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-sphinxsearch/dokuwiki-plugin-sphinxsearch.spec?r1=1.1&r2=1.2&f=u