From 8edbc80e10ff9973cc8df251529c2bf2b8b0dde2 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Mar 06 2013 09:49:13 +0000
Subject: Update to 2.0.6


- Remove obsoleted patches

---

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-0.9.9-default_listen.patch b/sphinx-0.9.9-default_listen.patch
deleted file mode 100644
index 408df7c..0000000
--- a/sphinx-0.9.9-default_listen.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur sphinx-0.9.9-orig/sphinx.conf.in sphinx-0.9.9/sphinx.conf.in
---- sphinx-0.9.9-orig/sphinx.conf.in	2009-11-07 00:09:58.000000000 +0100
-+++ sphinx-0.9.9/sphinx.conf.in	2010-12-11 17:35:07.383729029 +0100
-@@ -572,7 +572,7 @@
- 	# listen				= 192.168.0.1:9312
- 	# listen				= 9312
- 	# listen				= /var/run/searchd.sock
--
-+	listen					= 127.0.0.1:9312
- 
- 	# log file, searchd run info is logged here
- 	# optional, default is 'searchd.log'
-Only in sphinx-0.9.9: sphinx.conf.in~
-diff -ur sphinx-0.9.9-orig/sphinx-min.conf.in sphinx-0.9.9/sphinx-min.conf.in
---- sphinx-0.9.9-orig/sphinx-min.conf.in	2009-11-07 00:09:58.000000000 +0100
-+++ sphinx-0.9.9/sphinx-min.conf.in	2010-12-11 17:35:25.640860529 +0100
-@@ -40,7 +40,7 @@
- 
- searchd
- {
--	port					= 9312
-+	listen				= 127.0.0.1:9312
- 	log						= @CONFDIR@/log/searchd.log
- 	query_log				= @CONFDIR@/log/query.log
- 	read_timeout			= 5
-Only in sphinx-0.9.9: sphinx-min.conf.in~
diff --git a/sphinx-0.9.9-fix_static.patch b/sphinx-0.9.9-fix_static.patch
deleted file mode 100644
index a3a94bf..0000000
--- a/sphinx-0.9.9-fix_static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up sphinx-0.9.9/api/libsphinxclient/sphinxclient.c.fix_static sphinx-0.9.9/api/libsphinxclient/sphinxclient.c
---- sphinx-0.9.9/api/libsphinxclient/sphinxclient.c.fix_static	2010-02-11 08:32:43.473905916 -0300
-+++ sphinx-0.9.9/api/libsphinxclient/sphinxclient.c	2010-02-11 08:33:23.264905947 -0300
-@@ -277,7 +277,7 @@ static void sphinx_free_results ( sphinx
- }
- 
- 
--void sock_close ( int sock );
-+static void sock_close ( int sock );
- 
- void sphinx_destroy ( sphinx_client * client )
- {
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@fedoraproject.org> - 2.0.6-1
+- Update to 2.0.6
+- Remove obsoleted patches
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild