update to 8.1.0 GAv8.1.0

3 files changed, 9 insertions, 7 deletions

diff --git a/failed.txt b/failed.txt
index 36cd263..2d16e87 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.1.0RC6 (2021-11-11)
+===== 8.1.0 (2021-11-25)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php.ini b/php.ini
index fce542f..07b7a0f 100644
--- a/php.ini
+++ b/php.ini
@@ -1555,8 +1555,8 @@ zend.assertions = -1
 
 ; This directive specifies the regex pattern of content types for which mb_output_handler()
 ; is activated.
-; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
-;mbstring.http_output_conv_mimetype=
+; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml)
+;mbstring.http_output_conv_mimetypes=
 
 ; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
 ; to the pcre.recursion_limit for PCRE.
diff --git a/php.spec b/php.spec
index 4c473ec..6da8c3a 100644
--- a/php.spec
+++ b/php.spec
@@ -93,8 +93,7 @@
 %bcond_with           qdbm
 %endif
 
-# TODO change when 8.5 released (libxcrypt 4.1.1-6)
-%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8
 # switch to bundled library using --without libxcrypt
 %bcond_without        libxcrypt
 %else
@@ -128,8 +127,8 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.1.0
-%global rcver        RC6
-%global lower        rc6
+#global rcver        RC6
+#global lower        rc6
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -1851,6 +1850,9 @@ fi
 
 
 %changelog
+* Wed Nov 24 2021 Remi Collet <remi@remirepo.net> - 8.1.0-1
+- update to 8.1.0 GA
+
 * Wed Nov 10 2021 Remi Collet <remi@remirepo.net> - 8.1.0~rc6-1
 - update to 8.1.0RC6