Update to 7.4.21 - http://www.php.net/releases/7_4_21.php

2 files changed, 8 insertions, 5 deletions

diff --git a/failed.txt b/failed.txt
index 54cb6b5..789b9ff 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.4.21RC1 (2021-06-17)
+===== 7.4.21 (2021-07-01)
 
 $ grep -ar 'Tests failed' /var/lib/mock/scl74*/build.log
 
diff --git a/php.spec b/php.spec
index 38e6003..7efc48a 100644
--- a/php.spec
+++ b/php.spec
@@ -97,7 +97,7 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        7.4.21
-%global rcver        RC1
+#global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -947,7 +947,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 # WIP patch
 
 # Prevent %%doc confusion over LICENSE files
-cp Zend/LICENSE Zend/ZEND_LICENSE
+cp Zend/LICENSE ZEND_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
 cp sapi/fpm/LICENSE fpm_LICENSE
 cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE
@@ -1311,7 +1311,7 @@ popd
 %check
 %if %runselftest
 
-cd build-apache
+cd build-fpm
 
 # Run tests, using the CLI SAPI
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
@@ -1673,7 +1673,7 @@ fi
 
 %files common -f files.common
 %doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs
-%license LICENSE TSRM_LICENSE
+%license LICENSE TSRM_LICENSE ZEND_LICENSE
 %license libmagic_LICENSE
 %license timelib_LICENSE
 %doc php.ini-*
@@ -1815,6 +1815,9 @@ fi
 
 
 %changelog
+* Tue Jun 29 2021 Remi Collet <remi@remirepo.net> - 7.4.21-1
+- Update to 7.4.21 - http://www.php.net/releases/7_4_21.php
+
 * Wed Jun 16 2021 Remi Collet <remi@remirepo.net> - 7.4.21~RC1-1
 - update to 7.4.21RC1
 - ignore unsupported "threads" option on password_hash