From d032675b3c535c712b1650d0abd6a4d127228802 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 16 Feb 2018 08:54:17 +0100
Subject: [PATCH] disable pspell extension on RHEL improve devel dependencies

(cherry picked from commit 628ae561c8677059cc531cf8641f1f0f0c8b1f6e)
---
 php.spec | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/php.spec b/php.spec
index 638f670..2e9ea57 100644
--- a/php.spec
+++ b/php.spec
@@ -49,11 +49,13 @@
 %global with_imap     1
 %global with_freetds  1
 %global with_mcrypt   1
+%global with_pspell   1
 %else
 %global with_firebird 0
 %global with_imap     0
 %global with_freetds  0
 %global with_mcrypt   0
+%global with_pspell   0
 %endif
 
 %global upver        7.1.15
@@ -62,7 +64,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -127,7 +129,13 @@ BuildRequires: libstdc++-devel, openssl-devel
 BuildRequires: sqlite-devel >= 3.6.0
 BuildRequires: zlib-devel, smtpdaemon, libedit-devel
 BuildRequires: pcre-devel >= 6.6
-BuildRequires: bzip2, perl-interpreter, libtool >= 1.4.3, gcc-c++
+BuildRequires: bzip2
+BuildRequires: perl-interpreter
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: libtool
 BuildRequires: libtool-ltdl-devel
 %if %{with_libzip}
 BuildRequires: libzip-devel >= 0.11
@@ -262,7 +270,13 @@ package and the php-cli package.
 %package devel
 Group: Development/Libraries
 Summary: Files needed for building PHP extensions
-Requires: php-cli%{?_isa} = %{version}-%{release}, autoconf, automake
+Requires: php-cli%{?_isa} = %{version}-%{release}
+# always needed to build extension
+Requires: autoconf
+Requires: automake
+Requires: gcc
+Requires: gcc-c++
+Requires: libtool
 Requires: pcre-devel%{?_isa}
 Obsoletes: php-pecl-json-devel  < %{jsonver}
 Obsoletes: php-pecl-jsonc-devel < %{jsonver}
@@ -633,6 +647,7 @@ Provides: php-embedded-devel%{?_isa} = %{version}-%{release}
 The php-embedded package contains a library which can be embedded
 into applications to provide PHP scripting language support.
 
+%if %{with_pspell}
 %package pspell
 Summary: A module for PHP applications for using pspell interfaces
 Group: System Environment/Libraries
@@ -644,6 +659,7 @@ BuildRequires: aspell-devel >= 0.50.0
 %description pspell
 The php-pspell package contains a dynamic shared object that will add
 support for using the pspell library to PHP.
+%endif
 
 %package recode
 Summary: A module for PHP applications for using the recode library
@@ -971,7 +987,9 @@ build --libdir=%{_libdir}/php \
 %endif
       --without-readline \
       --with-libedit \
+%if %{with_pspell}
       --with-pspell=shared \
+%endif
       --enable-phar=shared \
 %if %{with_mcrypt}
       --with-mcrypt=shared,%{_prefix} \
@@ -1104,7 +1122,9 @@ build --includedir=%{_includedir}/php-zts \
 %endif
       --without-readline \
       --with-libedit \
+%if %{with_pspell}
       --with-pspell=shared \
+%endif
       --enable-phar=shared \
 %if %{with_mcrypt}
       --with-mcrypt=shared,%{_prefix} \
@@ -1271,7 +1291,10 @@ for mod in pgsql odbc ldap snmp xmlrpc \
 %if %{with_freetds}
     pdo_dblib \
 %endif
-    pspell curl wddx \
+%if %{with_pspell}
+    pspell \
+%endif
+    curl wddx \
     posix shmop sysvshm sysvsem sysvmsg recode xml \
     ; do
     case $mod in
@@ -1523,7 +1546,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 %if %{with_freetds}
 %files pdo-dblib -f files.pdo_dblib
 %endif
+%if %{with_pspell}
 %files pspell -f files.pspell
+%endif
 %files intl -f files.intl
 %files process -f files.process
 %files recode -f files.recode
@@ -1539,6 +1564,10 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %changelog
+* Fri Feb 16 2018 Remi Collet <remi@remirepo.net> - 7.1.15~RC1-2
+- disable pspell extension on RHEL
+- improve devel dependencies
+
 * Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.1.15~RC1-1
 - Update to 7.1.15RC1
 - adapt ldap patch