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

[glen]

Author: glen                         Date: Wed Jul 28 08:23:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 1.1

---- Files affected:
packages/phorum-mod-sphinx_search:
   phorum-mod-sphinx_search.spec (1.13 -> 1.14) , cleanup-junk.patch (1.1 -> NONE)  (REMOVED), crontab (1.2 -> NONE)  (REMOVED), defaultport.patch (1.1 -> NONE)  (REMOVED), doc-updates.patch (1.1 -> NONE)  (REMOVED), errors.patch (1.1 -> NONE)  (REMOVED), forum_id-filter.patch (1.2 -> NONE)  (REMOVED), index_names.patch (1.2 -> NONE)  (REMOVED), paths.patch (1.2 -> NONE)  (REMOVED), sph_counter.sql (1.1 -> NONE)  (REMOVED), sphinx.conf (1.4 -> NONE)  (REMOVED), sphinx_api.patch (1.1 -> NONE)  (REMOVED)

---- 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.13 packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.14
--- packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec:1.13	Wed Jul 21 08:42:41 2010
+++ packages/phorum-mod-sphinx_search/phorum-mod-sphinx_search.spec	Wed Jul 28 10:23:51 2010
@@ -4,23 +4,12 @@
 %define		module		sphinx_search
 Summary:	Sphinx Fulltext-Search Module
 Name:		phorum-mod-%{module}
-Version:	1.0.0
+Version:	1.1
 Release:	1
 License:	Apache-like
 Group:		Applications/WWW
-Source0:	http://www.phorum.org/phorum5/file.php/download/62/3354/sphinx_search_%{version}.tar.gz
-# Source0-md5:	fd6bafce5d77c1baf90bf5f5e157bfb8
-Source1:	sph_counter.sql
-Source2:	sphinx.conf
-Source3:	crontab
-Patch0:		paths.patch
-Patch1:		errors.patch
-Patch2:		index_names.patch
-Patch3:		cleanup-junk.patch
-Patch4:		doc-updates.patch
-Patch5:		defaultport.patch
-Patch6:		sphinx_api.patch
-Patch7:		forum_id-filter.patch
+Source0:	http://download.github.com/glensc-phorum-%{module}-%{version}-0-g20786ed.tar.gz
+# Source0-md5:	74498f460023d41c1d44ac6fca6518d5
 URL:		http://www.phorum.org/phorum5/read.php?62,136982,138325
 BuildRequires:	rpm-php-pearprov
 BuildRequires:	rpmbuild(macros) >= 1.553
@@ -49,25 +38,10 @@
 
 %prep
 %setup -qc
-mv %{module}/* .
-cp -a %{SOURCE1} .
-cp -a %{SOURCE2} .
-cp -a %{SOURCE3} .
-%undos *.php *.txt README Changelog
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+mv *-%{module}-*/* .
 
-# php-sphinx
-rm sphinxclient.php
-
-# cleanup backups after patching
-find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+# php-sphinx (native) or php-pecl-sphinx (extension)
+rm sphinxapi.php
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/07/28 08:23:51  glen
+- update to 1.1
+
 Revision 1.13  2010/07/21 06:42:41  glen
 - release 1
 
================================================================

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