packages: phorum-mod-sphinx_search/paths.patch, phorum-mod-sphinx_search/ph...

[glen]

Author: glen                         Date: Mon Jun 14 21:42:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- requires sphinx api (pecl or pure php)

---- Files affected:
packages/phorum-mod-sphinx_search:
   paths.patch (1.1 -> 1.2) , phorum-mod-sphinx_search.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/phorum-mod-sphinx_search/paths.patch
diff -u packages/phorum-mod-sphinx_search/paths.patch:1.1 packages/phorum-mod-sphinx_search/paths.patch:1.2
--- packages/phorum-mod-sphinx_search/paths.patch:1.1	Tue Mar 30 23:44:56 2010
+++ packages/phorum-mod-sphinx_search/paths.patch	Mon Jun 14 23:42:23 2010
@@ -18,9 +18,9 @@
      $frm = new PhorumInputForm ("", "post", "Save");
      $frm->hidden("module", "modsettings");
      $frm->hidden("mod", "sphinx_search");
---- phorum-mod-sphinx_search-1.0.0/sphinx_search.php~	2010-03-30 17:45:42.000000000 +0300
-+++ phorum-mod-sphinx_search-1.0.0/sphinx_search.php	2010-03-30 17:50:12.391868639 +0300
-@@ -15,13 +15,13 @@
+--- phorum-mod-sphinx_search-1.0.0/sphinx_search.php~	2010-06-15 00:37:12.000000000 +0300
++++ phorum-mod-sphinx_search-1.0.0/sphinx_search.php	2010-06-15 00:38:37.226287129 +0300
+@@ -15,13 +15,17 @@
  
  if (!defined("PHORUM")) return;
  
@@ -32,11 +32,15 @@
  	global $PHORUM;
  
 -    include './mods/sphinx_search/sphinxclient.php';
-+    require_once 'sphinxapi.php';
++	// No pecl class, try php version
++	if (!class_exists('SphinxClient')) {
++		// loads from php include_path
++		require_once 'sphinxapi.php';
++	}
  	
      // these are the index-names set in sphinx.conf - one for searching messages, the other for searching by authors only
      // both contain an additional index for the deltas - changes done after the last full reindex
-@@ -147,6 +147,3 @@
+@@ -147,6 +164,3 @@
      
  	return $arrSearch;
  }

================================================================
Index: packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec
diff -u packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.4 packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.5
--- packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.4	Wed Apr 14 15:40:17 2010
+++ packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec	Mon Jun 14 23:42:24 2010
@@ -5,7 +5,7 @@
 Summary:	Sphinx Fulltext-Search Module
 Name:		phorum-mod-%{module}
 Version:	1.0.0
-Release:	0.3
+Release:	0.5
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/phorum5/file.php/download/62/3354/sphinx_search_%{version}.tar.gz
@@ -18,6 +18,7 @@
 BuildRequires:	rpm-php-pearprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	phorum >= 5.2
+Requires:	php(sphinx)
 Requires:	php-date
 Requires:	php-pcre
 BuildArch:	noarch
@@ -75,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/06/14 21:42:24  glen
+- requires sphinx api (pecl or pure php)
+
 Revision 1.4  2010/04/14 13:40:17  glen
 - add sphinx conf. kind of works here
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum-mod-sphinx_search/paths.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec?r1=1.4&r2=1.5&f=u