[packages/sphinx/SPHINX_2_0] - rel 2; fix build with current am

arekm arekm at pld-linux.org
Fri Jan 17 12:03:29 CET 2014


commit 2c78e706e3482106ee34db374bf192590d05ec46
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Jan 17 12:03:27 2014 +0100

    - rel 2; fix build with current am

 sphinx-build.patch | 11 +++++++++++
 sphinx.spec        |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/sphinx.spec b/sphinx.spec
index 3bb19be..7e49622 100644
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -19,7 +19,7 @@ Summary:	Free open-source SQL full-text search engine
 Summary(pl.UTF-8):	Silnik przeszukiwania pełnotekstowego SQL open-source
 Name:		sphinx
 Version:	2.0.9
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	http://www.sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
@@ -29,6 +29,7 @@ Source2:	%{name}.logrotate
 Source3:	%{name}.conf.sh
 Source4:	%{name}.tmpfiles
 Patch0:		bug-468.patch
+Patch1:		%{name}-build.patch
 URL:		http://www.sphinxsearch.com/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.12
@@ -162,6 +163,7 @@ API Pythona dla Sphinksa.
 %prep
 %setup -q -n %{name}-%{version}-release
 %patch0 -p1
+%patch1 -p1
 
 sed -i -e 's#AM_MAINTAINER_MODE#AM_MAINTAINER_MODE\nAM_PROG_AR#' configure.ac
 
diff --git a/sphinx-build.patch b/sphinx-build.patch
new file mode 100644
index 0000000..6313025
--- /dev/null
+++ b/sphinx-build.patch
@@ -0,0 +1,11 @@
+--- sphinx-2.0.9-release/configure.ac~	2014-01-17 11:58:46.000000000 +0100
++++ sphinx-2.0.9-release/configure.ac	2014-01-17 11:59:42.265661279 +0100
+@@ -8,7 +8,7 @@
+ SPHINX_CONFIGURE_PART([checking build environment])
+ 
+ AC_CONFIG_AUX_DIR([config])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall foreign])
+ AM_MAINTAINER_MODE
+ AM_PROG_AR
+ AC_CONFIG_SRCDIR([src/searchd.cpp])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sphinx.git/commitdiff/2c78e706e3482106ee34db374bf192590d05ec46



More information about the pld-cvs-commit mailing list