From 1a68b62da1f9e5c1269e307936207af104bf1a94 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 12 Jul 2019 15:53:30 +0200
Subject: - drop recode extension, moved to php-pecl-recode - add upstream
 patch for argon2 password

---
 php.spec | 37 +++++++++----------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 1cc834c..4de1b9c 100644
--- a/php.spec
+++ b/php.spec
@@ -75,7 +75,6 @@
 %global with_tidy      1
 %global with_sqlite3   1
 %global with_enchant   1
-%global with_recode    1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 %global with_libpcre      1
 %else
@@ -109,7 +108,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 12%{?dist}
+Release: 13%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -146,7 +145,6 @@ Source53: 20-ffi.ini
 Patch1: php-7.4.0-httpd.patch
 Patch5: php-7.2.0-includedir.patch
 Patch6: php-7.4.0-embed.patch
-Patch7: php-7.4.0-recode.patch
 Patch8: php-7.2.0-libdb.patch
 Patch9: php-7.0.7-curl.patch
 
@@ -165,6 +163,7 @@ Patch47: php-5.6.3-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
+Patch100: php-upstream.patch
 
 # Security fixes (200+)
 
@@ -801,20 +800,6 @@ BuildRequires: aspell-devel >= 0.50.0
 The %{?scl_prefix}php-pspell package contains a dynamic shared object that will add
 support for using the pspell library to PHP.
 
-%if %{with_recode}
-%package recode
-Summary: A module for PHP applications for using the recode library
-Group: System Environment/Libraries
-# All files licensed under PHP version 3.01
-License: PHP
-Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
-BuildRequires: recode-devel
-
-%description recode
-The %{?scl_prefix}php-recode package contains a dynamic shared object that will add
-support for using the recode library to PHP.
-%endif
-
 %package intl
 Summary: Internationalization extension for PHP applications
 Group: System Environment/Libraries
@@ -825,7 +810,6 @@ BuildRequires: pkgconfig(icu-i18n) >= 50.1
 BuildRequires: pkgconfig(icu-io)   >= 50.1
 BuildRequires: pkgconfig(icu-uc)   >= 50.1
 
-
 %description intl
 The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
 support for using the ICU library to PHP.
@@ -915,10 +899,11 @@ in pure PHP.
 %setup -q -n php-%{upver}%{?rcver}
 %endif
 
+rm -r ext/recode
+
 %patch1 -p1 -b .mpmcheck
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
-%patch7 -p1 -b .recode
 %patch8 -p1 -b .libdb
 %if 0%{?rhel}
 %patch9 -p1 -b .curltls
@@ -938,6 +923,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch100 -p1 -b .up
 
 # security patches
 
@@ -1243,9 +1229,6 @@ build --libdir=%{_libdir}/php \
       --enable-intl=shared \
 %if %{with_enchant}
       --with-enchant=shared \
-%endif
-%if %{with_recode}
-      --with-recode=shared,%{_root_prefix} \
 %endif
       --enable-fileinfo=shared \
       --with-ffi=shared \
@@ -1493,9 +1476,6 @@ for mod in pgsql odbc ldap snmp xmlrpc \
 %if %{with_freetds}
     pdo_dblib \
 %endif
-%if %{with_recode}
-    recode \
-%endif
 %if %{with_zip}
     zip \
 %endif
@@ -1770,9 +1750,6 @@ fi
 %files pspell -f files.pspell
 %files intl -f files.intl
 %files process -f files.process
-%if %{with_recode}
-%files recode -f files.recode
-%endif
 %if %{with_interbase}
 %files pdo-firebird -f files.pdo_firebird
 %endif
@@ -1794,6 +1771,10 @@ fi
 
 
 %changelog
+* Fri Jul 12 2019 Remi Collet <remi@remirepo.net> - 7.4.0~alpha3-13
+- drop recode extension, moved to php-pecl-recode
+- add upstream patch for argon2 password
+
 * Tue Jul  9 2019 Remi Collet <remi@remirepo.net> - 7.4.0~alpha3-12
 - update to 7.4.0alpha3
 - drop argon2 dependency using libsodium implementation
-- 
cgit