[sphinx] Update to 2.0.6

[Michel Alexandre Salim]

commit 8edbc80e10ff9973cc8df251529c2bf2b8b0dde2
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Wed Mar 6 15:42:39 2013 +0700

    Update to 2.0.6
    
    - Remove obsoleted patches

 .gitignore                        |    3 +--
 sources                           |    2 +-
 sphinx-0.9.9-default_listen.patch |   26 --------------------------
 sphinx-0.9.9-fix_static.patch     |   12 ------------
 sphinx.spec                       |   31 ++++++++++++++++++++-----------
 5 files changed, 22 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1c9f8a..6691bad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-sphinx-0.9.9.tar.gz
-/sphinx-2.0.3-release.tar.gz
+/sphinx-2.0.6-release.tar.gz
diff --git a/sources b/sources
index f2b3e3c..86f0971 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1293aecd5034aa797811610beb7ba89  sphinx-2.0.3-release.tar.gz
+de6be5ee20b1bfafa2a0cea7155a8331  sphinx-2.0.6-release.tar.gz
diff --git a/sphinx.spec b/sphinx.spec
index 3424a28..9f8635c 100644
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -3,24 +3,26 @@
 %global sphinx_home %{_localstatedir}/lib/sphinx
 
 Name:           sphinx
-Version:        2.0.3
-Release:        3%{?dist}
+Version:        2.0.6
+Release:        1%{?dist}
 Summary:        Free open-source SQL full-text search engine
 
 Group:          Applications/Text
 License:        GPLv2+
 URL:            http://sphinxsearch.com
-Source0:        http://sphinxsearch.com/downloads/%{name}-%{version}-release.tar.gz
+Source0:        http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
 Source1:        searchd.service
 Patch0:         %{name}-2.0.3-fix_static.patch
 Patch1:         %{name}-2.0.3-default_listen.patch
-Patch2:		sphinx-2.0.3-gcc47.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mysql-devel
-
 BuildRequires:  postgresql-devel
 BuildRequires:  expat-devel
+
+# for fix-ups
+BuildRequires:  dos2unix
 #Requires:
 
 #Initscripts
@@ -108,17 +110,20 @@ designed with indexing database content in mind.
 %setup -qn %{name}-%{version}-release
 %patch0 -p1 -b .fix_static
 %patch1 -p1 -b .default_listen
-%patch2 -p0 -b .gcc47
 
 # Fix wrong-file-end-of-line-encoding
-sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql
-sed -i 's/\r//' api/java/mk.cmd
-sed -i 's/\r//' api/ruby/spec/fixtures/keywords.php
-sed -i 's/\r//' api/ruby/lib/sphinx/response.rb
+for f in \
+    api/java/mk.cmd \
+    api/ruby/test.rb \
+    api/ruby/spec/sphinx/sphinx_test.sql \
+; do
+  dos2unix ${f}
+done
+
 
 
 %build
-%configure --sysconfdir=/etc/sphinx --with-mysql --with-pgsql
+%configure --sysconfdir=%{_sysconfdir}/sphinx --with-mysql --with-pgsql
 make %{?_smp_mflags}
 
 # Build libsphinxclient
@@ -311,6 +316,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/
 %{_datadir}/php/*
 
 %changelog
+* Wed Mar  6 2013 Michel Salim <salimma at fedoraproject.org> - 2.0.6-1
+- Update to 2.0.6
+- Remove obsoleted patches
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild