WordPress 5.5 “Eckstine”

requires php-phpmailer6 instead of old php-PHPMailer

(cherry picked from commit 8fc4eba2f3)
(cherry picked from commit 50af1532e8)

sources

@@ -1 +1 @@
-SHA512 (wordpress-5.4.2.tar.gz) = d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219
+SHA512 (wordpress-5.5.tar.gz) = 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865

wordpress.spec

@@ -18,7 +18,7 @@
 %else
 %global clean_compat 0
 %endif
-%global upstream_version 5.4.2
+%global upstream_version 5.5
 #global upstream_prever  RC5
 #global upstream_lower   rc5
 
@@ -120,7 +120,7 @@ Requires: php-xmlreader
 Requires: php-zip
 Requires: php-zlib
 # Unbundled libraries
-Requires: php-PHPMailer
+Requires: php-phpmailer6
 Requires: httpd
 Requires: ca-certificates
 Provides: wordpress-mu = %{version}-%{release}
@@ -234,12 +234,9 @@ ln -s /usr/share/php/php-simplepie/autoloader.php \
        ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
 
 # Remove bundled PHPMailer and link to system one
-# Note POP3 is not from PHPMailer but from SquirrelMail
-for fic in phpmailer smtp; do
-  rm     ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
-  ln -sf /usr/share/php/PHPMailer/class.$fic.php \
-         ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
-done
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer
+ln -s /usr/share/php/PHPMailer/PHPMailer6 \
+      ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer
 
 # Remove bundled php-getid3
 rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3
@@ -296,6 +293,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Wed Aug 12 2020 Remi Collet <remi@remirepo.net> - 5.5-1
+- WordPress 5.5 “Eckstine”
+- requires php-phpmailer6 instead of old php-PHPMailer
+
 * Thu Jun 11 2020 Remi Collet <remi@remirepo.net> - 5.4.2-1
 - WordPress 5.4.2 Security and Maintenance Release