packages: phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec, phorum-mo...

[glen]

Author: glen                         Date: Mon Jun 14 21:45:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify index names (deltas end with _d)

---- Files affected:
packages/phorum-mod-sphinx_search:
   phorum-mod-sphinx_search.spec (1.5 -> 1.6) , index_names.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec
diff -u packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.5 packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.6
--- packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.5	Mon Jun 14 23:42:24 2010
+++ packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec	Mon Jun 14 23:45:28 2010
@@ -5,7 +5,7 @@
 Summary:	Sphinx Fulltext-Search Module
 Name:		phorum-mod-%{module}
 Version:	1.0.0
-Release:	0.5
+Release:	0.6
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/phorum5/file.php/download/62/3354/sphinx_search_%{version}.tar.gz
@@ -14,9 +14,10 @@
 Source2:	sphinx.conf
 Patch0:		paths.patch
 Patch1:		errors.patch
+Patch2:		index_names.patch
 URL:		http://www.phorum.org/phorum5/read.php?62,136982,138325
 BuildRequires:	rpm-php-pearprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	phorum >= 5.2
 Requires:	php(sphinx)
 Requires:	php-date
@@ -45,9 +46,10 @@
 mv %{module}/* .
 cp -a %{SOURCE1} .
 cp -a %{SOURCE2} .
-%{__sed} -i -e 's,\r$,,' *.php *.txt README Changelog
+%undos *.php *.txt README Changelog
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # php-sphinx
 rm sphinxclient.php
@@ -76,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/06/14 21:45:28  glen
+- unify index names (deltas end with _d)
+
 Revision 1.5  2010/06/14 21:42:24  glen
 - requires sphinx api (pecl or pure php)
 

================================================================
Index: packages/phorum-mod-sphinx_search/index_names.patch
diff -u /dev/null packages/phorum-mod-sphinx_search/index_names.patch:1.1
--- /dev/null	Mon Jun 14 23:45:33 2010
+++ packages/phorum-mod-sphinx_search/index_names.patch	Mon Jun 14 23:45:28 2010
@@ -0,0 +1,61 @@
+--- sphinx_search/sphinx_search.php~	2010-04-14 16:39:47.000000000 +0300
++++ sphinx_search/sphinx_search.php	2010-06-15 00:35:42.346275766 +0300
+@@ -26,7 +26,7 @@
+     // 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
+     $index_name_msg = "phorum5_msg_d phorum5_msg";
+-    $index_name_author = "phorum5_author phorum5_author_delta";
++    $index_name_author = "phorum5_author phorum5_author_d";
+     
+     // excerpts_index is just one index as that function only accepts one, it used for determining charsets / mapping tables, nothing more
+     $excerpts_index = "phorum5_msg";  
+--- phorum-mod-sphinx_search-1.0.0/README~	2010-06-15 00:43:33.000000000 +0300
++++ phorum-mod-sphinx_search-1.0.0/README	2010-06-15 00:44:08.319793287 +0300
+@@ -158,7 +158,7 @@
+                 WHERE message_id<=( SELECT max_doc_id FROM sph_counter WHERE counter_id=1 and type = 'author' ) and status=2
+ }
+ 
+-source phorum5_author_delta : phorum5_base
++source phorum5_author_d : phorum5_base
+ {
+ 
+         # main document fetch query
+@@ -180,10 +180,10 @@
+ 
+ 
+ 
+-index phorum5_author_delta : phorum5_base
++index phorum5_author_d : phorum5_base
+ {
+-        source = phorum5_author_delta
+-        path = /usr/local/sphinx/var/data/phorum5_author_delta
++        source = phorum5_author_d
++        path = /usr/local/sphinx/var/data/phorum5_author_d
+ }
+ 
+ 
+--- phorum-mod-sphinx_search-1.0.0/sphinx.conf~	2010-04-14 16:38:35.000000000 +0300
++++ phorum-mod-sphinx_search-1.0.0/sphinx.conf	2010-06-15 00:44:28.003527305 +0300
+@@ -116,7 +116,7 @@
+ 			WHERE message_id<=( SELECT max_doc_id FROM sph_counter WHERE counter_id=1 and type = 'author' ) and status=2
+ }
+ 
+-source phorum5_author_delta : phorum5_base
++source phorum5_author_d : phorum5_base
+ {
+ 	# main document fetch query
+ 	# you can specify any number of fields
+@@ -137,10 +137,10 @@
+ }
+ 
+ 
+-index phorum5_author_delta : phorum5_base
++index phorum5_author_d : phorum5_base
+ {
+-	source              = phorum5_author_delta
+-	path                = /var/lib/sphinx/phorum5/phorum5_author_delta
++	source              = phorum5_author_d
++	path                = /var/lib/sphinx/phorum5/phorum5_author_d
+ 	charset_type        = utf-8
+ }
+ 
================================================================

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