diff --git a/sources b/sources index afbed23..efbd492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.4.2.tar.gz) = d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219 +SHA512 (wordpress-5.5.tar.gz) = 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865 diff --git a/wordpress.spec b/wordpress.spec index 49e6421..c4b38d6 100644 --- a/wordpress.spec +++ b/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 @@ -26,7 +26,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -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 - 5.5-1 +- WordPress 5.5 “Eckstine” +- requires php-phpmailer6 instead of old php-PHPMailer + * Wed Jul 29 2020 Fedora Release Engineering - 5.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild