[php-extras/el6] Improve temp spec file for php 5.4 - disable recode and tidy on rhel-6 - enable enchant on rhel-5 -

[Remi Collet]

commit f174b630a6beed9e9c12c422c328312a856c836e
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Jul 23 13:31:13 2013 +0200

    Improve temp spec file for php 5.4
    - disable recode and tidy on rhel-6
    - enable enchant on rhel-5
    - improve package descriptions

 php-extras.spec-5.4 |   56 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 8 deletions(-)
---
diff --git a/php-extras.spec-5.4 b/php-extras.spec-5.4
index 7948420..33dc1c3 100644
--- a/php-extras.spec-5.4
+++ b/php-extras.spec-5.4
@@ -11,17 +11,19 @@
 %{expand:%def interbase}
 %{expand:%def mcrypt}
 %{expand:%def mssql}
+%if 0%{?rhel} < 6
 %{expand:%def recode}
 %{expand:%def tidy}
+%{expand:%def enchant}
+%endif
 
-%define list	%{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
+%define list	%{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird} %{?_with_enchant:enchant}
 %define opts	%{?_with_interbase:--with-interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird}
 
-
 Name:       %{?scl_prefix}php-extras
 Summary:    Additional PHP modules from the standard PHP distribution
 Version:    5.4.16
-Release:    2%{?dist}
+Release:    3%{?dist}
 Group:      Development/Languages
 License:    The PHP License
 URL:        http://www.php.net/
@@ -46,7 +48,8 @@ Requires:    %{?scl_prefix}php(api) = %{php_core_api}
 %{?_with_recode:BuildRequires: recode-devel}
 
 %description -n %{?scl_prefix}php-recode
-Standard PHP module provides GNU recode support
+The %{?scl_prefix}php-recode package contains a dynamic shared object that will
+add support for using the recode library to PHP.
 
 
 %package -n %{?scl_prefix}php-mcrypt
@@ -57,7 +60,8 @@ Requires:    %{?scl_prefix}php(api) = %{php_core_api}
 %{?_with_mcrypt:BuildRequires: libmcrypt-devel}
 
 %description -n %{?scl_prefix}php-mcrypt
-Standard PHP module provides mcrypt library support
+The %{?scl_prefix}php-mcrypt package contains a dynamic shared object that will
+add support for using the mcrypt library to PHP.
 
 
 %package -n %{?scl_prefix}php-tidy
@@ -68,7 +72,8 @@ Requires:    %{?scl_prefix}php(api) = %{php_core_api}
 %{?_with_tidy:BuildRequires: libtidy-devel}
 
 %description -n %{?scl_prefix}php-tidy
-Standard PHP module provides tidy library support
+The %{?scl_prefix}php-tidy package contains a dynamic shared object that will
+add support for using the tidy library to PHP.
 
 
 %package -n %{?scl_prefix}php-mssql
@@ -81,7 +86,10 @@ Provides:    php_database
 %{?_with_mssql:BuildRequires: freetds-devel}
 
 %description -n %{?scl_prefix}php-mssql
-Standard PHP module provides mssql support
+The %{?scl_prefix}php-mssql package contains a dynamic shared object that will
+add MSSQL database support to PHP.  It uses the TDS (Tabular
+DataStream) protocol through the freetds library, hence any
+database server which supports TDS can be accessed.
 
 
 %package -n %{?scl_prefix}php-interbase
@@ -94,7 +102,30 @@ Provides: php_database, php-firebird
 %{?_with_interbase:BuildRequires: firebird-devel}
 
 %description -n %{?scl_prefix}php-interbase
-Standard PHP module provides interbase/firebird support
+The %{?scl_prefix}php-interbase package contains a dynamic shared object that will
+add database support through Interbase/Firebird to PHP.
+
+InterBase is the name of the closed-source variant of this RDBMS that was
+developed by Borland/Inprise.
+
+Firebird is a commercially independent project of C and C++ programmers,
+technical advisors and supporters developing and enhancing a multi-platform
+relational database management system based on the source code released by
+Inprise Corp (now known as Borland Software Corp) under the InterBase Public
+License.
+
+
+%package -n %{?scl_prefix}php-enchant
+Summary:     Human Language and Character Encoding Support
+License:     PHP
+Group:       Development/Languages
+Requires:    %{?scl_prefix}php(zend-abi) = %{php_zend_api}
+Requires:    %{?scl_prefix}php(api) = %{php_core_api}
+%{?_with_enchant:BuildRequires: enchant-devel >= 1.2.4}
+
+%description -n %{?scl_prefix}php-enchant
+The %{?scl_prefix}php-intl package contains a dynamic shared object that will
+add support for using the enchant library to PHP.
 
 
 # Filter private shared
@@ -108,6 +139,9 @@ Standard PHP module provides interbase/firebird support
 # avoid tests which requires databases
 rm -rf ext/{mssql,pdo_dblib,interbase,pdo_firebird}/tests
 
+# Need investigation (seems libenchant in epel-5 is too old)
+rm -f ext/enchant/tests/{bug13181,broker_request_dict}.phpt
+
 
 %build
 for mod in %{list}
@@ -184,9 +218,15 @@ rm -rf %{buildroot}
 %{expand:%fil tidy}
 %{expand:%fil mssql}
 %{expand:%fil interbase}
+%{expand:%fil enchant}
 
 
 %changelog
+* Tue Jul 23 2013 Remi Collet <rcollet at redhat.com> - 5.4.16-3
+- disable recode and tidy on rhel-6
+- enable enchant on rhel-5
+- improve package descriptions
+
 * Thu Jul 18 2013 Remi Collet <rcollet at redhat.com> - 5.4.16-2
 - rebuild for new value of php(zend-abi) and php(api)