- up to final 2.0.3; 0.9.x series on SPHINX_0_9 tag

Changed files:
    bug-297.patch -> 1.2
    bug-468.patch -> 1.2
    sphinx-system-libstemmer.patch -> 1.4
    sphinx.spec -> 1.41

diff --git a/bug-297.patch b/bug-297.patch
deleted file mode 100644 (file)
index 1395e68..0000000
--- a/bug-297.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.sphinxsearch.com/bugs/view.php?id=297
-https://code.google.com/p/sphinxsearch/source/detail?r=2051
-
---- sphinx-0.9.9/src/sphinx.cpp~       2011-02-09 12:30:45.000000000 +0200
-+++ sphinx-0.9.9/src/sphinx.cpp        2011-02-09 12:33:23.908126477 +0200
-@@ -14386,6 +14386,7 @@
-       {
-               m_sLastError.SetSprintf ( "failed to lock %s: %s", sName, strerror(errno) );
-               ::close ( m_iLockFD );
-+              m_iLockFD = -1;
-               return false;
-       }
- 

diff --git a/bug-468.patch b/bug-468.patch
index c2a5c17b73265259c63764272035ad0be83345f8..247982f018de49b63686693677dc408284382b5d 100644 (file)
--- a/bug-468.patch
+++ b/bug-468.patch
@@ -12,3 +12,12 @@ http://code.google.com/p/sphinxsearch/source/detail?r=2225
  
  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;

diff --git a/sphinx-system-libstemmer.patch b/sphinx-system-libstemmer.patch
index fed2eb06087542ffe6e55d6e49e673f90710322e..38c8b8a4a2a47edbf2442089e68bbaeebe766486 100644 (file)
--- a/sphinx-system-libstemmer.patch
+++ b/sphinx-system-libstemmer.patch
@@ -139,22 +139,22 @@ diff -burN sphinx-0.9.8.orig/Makefile.am sphinx-0.9.8/Makefile.am
 @@ -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)

diff --git a/sphinx.spec b/sphinx.spec
index 44d5cba7c02fcd5e62f98058b3cf41f6610ce2fa..ccba0feab9fd2642709aef78ef84c6a2969046da 100644 (file)
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -18,18 +18,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
@@ -148,10 +147,9 @@ Python API for Sphinx.
 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/#
@@ -169,7 +167,8 @@ CPPFLAGS=-D_FILE_OFFSET_BITS=64
 %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
@@ -284,6 +283,12 @@ fi
 %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