packages: sphinx/bug-468.patch, sphinx/sphinx-system-libstemmer.patch, sphi...

[arekm]

Author: arekm                        Date: Sat Dec 31 07:28:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to final 2.0.3; 0.9.x series on SPHINX_0_9 tag

---- Files affected:
packages/sphinx:
   bug-468.patch (1.1 -> 1.2) , sphinx-system-libstemmer.patch (1.3 -> 1.4) , sphinx.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: packages/sphinx/bug-468.patch
diff -u packages/sphinx/bug-468.patch:1.1 packages/sphinx/bug-468.patch:1.2
--- packages/sphinx/bug-468.patch:1.1	Wed Mar 31 00:24:06 2010
+++ packages/sphinx/bug-468.patch	Sat Dec 31 08:28:00 2011
@@ -12,3 +12,12 @@
  
  void sphinx_destroy ( sphinx_client * client )
  {
+@@ -1253,7 +1253,7 @@
+ }
+ 
+ 
+-void sock_close ( int sock )
++static void sock_close ( int sock )
+ {
+ 	if ( sock<0 )
+ 		return;

================================================================
Index: packages/sphinx/sphinx-system-libstemmer.patch
diff -u packages/sphinx/sphinx-system-libstemmer.patch:1.3 packages/sphinx/sphinx-system-libstemmer.patch:1.4
--- packages/sphinx/sphinx-system-libstemmer.patch:1.3	Sat Nov 21 15:37:43 2009
+++ packages/sphinx/sphinx-system-libstemmer.patch	Sat Dec 31 08:28:00 2011
@@ -139,22 +139,22 @@
 @@ -1,4 +1,4 @@
 -if USE_LIBSTEMMER
 +if USE_INTERNAL_LIBSTEMMER
- SUBDIRS = libstemmer_c src test
+ SUBDIRS = libstemmer_c src test doc
  else
- SUBDIRS = src test
+ SUBDIRS = src test doc
 diff -burN sphinx-0.9.8.orig/src/Makefile.am sphinx-0.9.8/src/Makefile.am
 --- sphinx-0.9.8.orig/src/Makefile.am	2008-08-03 02:22:01.000000000 +0200
 +++ sphinx-0.9.8/src/Makefile.am	2008-08-03 12:32:28.000000000 +0200
-@@ -19,13 +19,7 @@
+@@ -21,13 +21,7 @@
  extract-version:
- 	if test -d ../.svn; then svn info .. --xml | perl svnxrev.pl; fi;
+ 	/bin/sh svnxrev.sh ..
  
 -if USE_LIBSTEMMER
 -LIBSTEMMER_LIBS = $(top_srcdir)/libstemmer_c/libstemmer.a
--AM_CPPFLAGS = -I$(top_srcdir)/libstemmer_c/include -DSYSCONFDIR="\"$(sysconfdir)\""
+-AM_CPPFLAGS = -I$(top_srcdir)/libstemmer_c/include -DSYSCONFDIR="\"$(sysconfdir)\"" -DDATADIR="\"$(localstatedir)/data\""
 -else
 -LIBSTEMMER_LIBS =
- AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\""
+ AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" -DDATADIR="\"$(localstatedir)/data\""
 -endif
  
  COMMON_LIBS = libsphinx.a $(LIBSTEMMER_LIBS) $(MYSQL_LIBS) $(PGSQL_LIBS)

================================================================
Index: packages/sphinx/sphinx.spec
diff -u packages/sphinx/sphinx.spec:1.40 packages/sphinx/sphinx.spec:1.41
--- packages/sphinx/sphinx.spec:1.40	Fri Nov 25 15:49:56 2011
+++ packages/sphinx/sphinx.spec	Sat Dec 31 08:28:00 2011
@@ -19,18 +19,17 @@
 Summary:	Free open-source SQL full-text search engine
 Summary(pl.UTF-8):	Silnik przeszukiwania pełnotekstowego SQL open-source
 Name:		sphinx
-Version:	0.9.9
-Release:	8
+Version:	2.0.3
+Release:	1
 License:	GPL v2
 Group:		Applications/Databases
-Source0:	http://www.sphinxsearch.com/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	7b9b618cb9b378f949bb1b91ddcc4f54
+Source0:	http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
+# Source0-md5:	a1293aecd5034aa797811610beb7ba89
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.conf.sh
 Patch0:		%{name}-system-libstemmer.patch
 Patch1:		bug-468.patch
-Patch2:		bug-297.patch
 URL:		http://www.sphinxsearch.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -149,10 +148,9 @@
 API Pythona dla Sphinksa.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-release
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 sed -i -e '
 	s#/var/run/#/var/run/sphinx/#
@@ -170,7 +168,8 @@
 %configure \
 	--with%{!?with_libstemmer:out}-libstemmer \
 	--with%{!?with_pgsql:out}-pgsql \
-	--with%{!?with_mysql:out}-mysql
+	--with%{!?with_mysql:out}-mysql \
+	--with-syslog
 %{__make} -j1
 # use .conf ext for %doc
 cp -f sphinx.conf.dist sphinx.conf
@@ -285,6 +284,12 @@
 %attr(755,root,root) %{_bindir}/spelldump
 %attr(755,root,root) %{_sbindir}/searchd
 
+%{_mandir}/man1/indexer.1*
+%{_mandir}/man1/indextool.1*
+%{_mandir}/man1/search.1*
+%{_mandir}/man1/searchd.1*
+%{_mandir}/man1/spelldump.1*
+
 %dir %attr(771,root,sphinx) /var/run/sphinx
 %dir %attr(770,root,sphinx) /var/log/sphinx
 %dir %attr(770,root,sphinx) /var/log/archive/sphinx
@@ -326,6 +331,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2011/12/31 07:28:00  arekm
+- up to final 2.0.3; 0.9.x series on SPHINX_0_9 tag
+
 Revision 1.40  2011/11/25 14:49:56  glen
 - add include support from main config; trigger included, but you need to start daemon after upgrade
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/bug-468.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/sphinx-system-libstemmer.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/sphinx.spec?r1=1.40&r2=1.41&f=u