[php-extras/el6/master] .

[Dmitry Butskoy]

commit def0ddf6a187508c3a95c2c295f11d0fc460fd3e
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Wed Dec 22 17:26:35 2010 +0300

    .

 php-extras-5.3.2-readline.patch |   11 +++++++----
 php-extras.spec                 |   20 ++++----------------
 2 files changed, 11 insertions(+), 20 deletions(-)
---
diff --git a/php-extras-5.3.2-readline.patch b/php-extras-5.3.2-readline.patch
index 017ee60..10d0f01 100644
--- a/php-extras-5.3.2-readline.patch
+++ b/php-extras-5.3.2-readline.patch
@@ -1,9 +1,12 @@
 diff -Nrbu php-5.3.3/ext/readline/config.m4 php-5.3.3-OK/ext/readline/config.m4
 --- php-5.3.3/ext/readline/config.m4	2009-12-13 20:06:47.000000000 +0300
-+++ php-5.3.3-OK/ext/readline/config.m4	2010-12-22 16:26:47.000000000 +0300
-@@ -5,13 +5,8 @@
- PHP_ARG_WITH(libedit,for libedit readline replacement, 
- [  --with-libedit[=DIR]    Include libedit readline replacement (CLI/CGI only)])
++++ php-5.3.3-OK/ext/readline/config.m4	2010-12-22 17:23:57.000000000 +0300
+@@ -2,16 +2,9 @@
+ dnl $Id: config.m4 292081 2009-12-13 17:06:47Z felipe $
+ dnl
+ 
+-PHP_ARG_WITH(libedit,for libedit readline replacement, 
+-[  --with-libedit[=DIR]    Include libedit readline replacement (CLI/CGI only)])
  
 -if test "$PHP_LIBEDIT" = "no"; then
    PHP_ARG_WITH(readline,for readline support,
diff --git a/php-extras.spec b/php-extras.spec
index 3db835f..e59974e 100644
--- a/php-extras.spec
+++ b/php-extras.spec
@@ -1,18 +1,17 @@
-#  EPEL6:  readline, recode, mcrypt, mhash, tidy, mssql, interbase
+#  EPEL6:  readline, recode, mcrypt, tidy, mssql, interbase
 
 %define def()	%%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
 
 %{expand:%def readline}
 #  recode
 %{expand:%def mcrypt}
-%{expand:%def mhash}
 %{expand:%def tidy}
 %{expand:%def mssql}
 %{expand:%def interbase}
 
-%define list	%{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
+%define list	%{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
 
-%define opts	%{?_with_readline:--without-libedit} %{?_with_interbase:--with-interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird}
+%define opts	%{?_with_interbase:--with-interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird}
 
 
 %global extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
@@ -70,16 +69,6 @@ Requires: php >= %{version}, php-api = %{apiver}
 Standard PHP module provides mcrypt library support
 
 
-%package -n php-mhash
-Summary: Standard PHP module provides mhash support
-Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
-%{?_with_mhash:BuildRequires: mhash-devel}
-
-%description -n php-mhash
-Standard PHP module provides mhash support
-
-
 %package -n php-tidy
 Summary: Standard PHP module provides tidy library support
 Group: Development/Languages
@@ -114,7 +103,7 @@ Standard PHP module provides interbase/firebird support
 
 %prep
 %setup -q -n php-%{version}
-#%patch1 -p1
+%patch1 -p1
 
 # avoid tests which requires databases
 rm -rf ext/{mssql,pdo_dblib,interbase,pdo_firebird}/tests
@@ -251,7 +240,6 @@ rm -rf $RPM_BUILD_ROOT
 %{expand:%fil readline}
 %{expand:%fil recode}
 %{expand:%fil mcrypt}
-%{expand:%fil mhash}
 %{expand:%fil tidy}
 %{expand:%fil mssql}
 %{expand:%fil interbase}