WordPress 5.5.3 Maintenance Release

(cherry picked from commit 5105b4124c)

sources

@@ -1 +1 @@
-SHA512 (wordpress-5.2.3.tar.gz) = 4fb37cb5b5bafbbb556910a69bbe3c83163c660e0186b1a30e095c1fc5950b8474592f17b743f0fb8a4f23f0f0080d3c92f0c45a2a1388911e69994d9c8a2194
+SHA512 (wordpress-5.5.3.tar.gz) = acc96987e792c85f1a1e4fbc434dc10e6c648ba51d0239354d8ee398604db90c6dfa075b565ddb4ab15cb36d9e06095c93ce30027b3cb61b04ffe5986069da03

wordpress-4.9-mediaelement_no_swf.patch

@@ -1,38 +0,0 @@
-diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js
---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old	2017-11-16 09:22:17.148277728 +0100
-+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js	2017-11-16 09:23:42.056696625 +0100
-@@ -6121,6 +6121,7 @@ if (hasFlash) {
- 		}
- 	});
- 
-+/* swf files removed from RPM
- 	var FlashMediaElementVideoRenderer = {
- 		name: 'flash_video',
- 		options: {
-@@ -6205,6 +6206,7 @@ if (hasFlash) {
- 		create: FlashMediaElementRenderer.create
- 	};
- 	_renderer.renderer.add(FlashMediaElementAudioOggRenderer);
-+*/
- }
- 
- },{"2":2,"25":25,"27":27,"28":28,"3":3,"5":5,"7":7,"8":8}],21:[function(_dereq_,module,exports){
-diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.old wordpress/wp-includes/js/mediaelement/mediaelement.js
---- wordpress/wp-includes/js/mediaelement/mediaelement.js.old	2017-11-16 09:24:44.984007081 +0100
-+++ wordpress/wp-includes/js/mediaelement/mediaelement.js	2017-11-16 09:24:49.655030123 +0100
-@@ -1839,6 +1839,7 @@ if (hasFlash) {
- 		}
- 	});
- 
-+/* swf files removed from RPM
- 	var FlashMediaElementVideoRenderer = {
- 		name: 'flash_video',
- 		options: {
-@@ -1923,6 +1924,7 @@ if (hasFlash) {
- 		create: FlashMediaElementRenderer.create
- 	};
- 	_renderer.renderer.add(FlashMediaElementAudioOggRenderer);
-+*/
- }
- 
- },{"16":16,"18":18,"19":19,"2":2,"3":3,"5":5,"7":7,"8":8}],12:[function(_dereq_,module,exports){

wordpress-5.1-systemlibs.patch

@@ -1,21 +0,0 @@
-diff -up wordpress/wp-admin/includes/media.php.orig wordpress/wp-admin/includes/media.php
---- wordpress/wp-admin/includes/media.php.orig	2019-02-21 15:01:56.055165397 +0100
-+++ wordpress/wp-admin/includes/media.php	2019-02-21 15:02:41.288395787 +0100
-@@ -3261,7 +3261,7 @@ function wp_read_video_metadata( $file )
- 	}
- 
- 	if ( ! class_exists( 'getID3', false ) ) {
--		require( ABSPATH . WPINC . '/ID3/getid3.php' );
-+		require( '/usr/share/php/getid3/getid3.php' );
- 	}
- 	$id3  = new getID3();
- 	$data = $id3->analyze( $file );
-@@ -3358,7 +3358,7 @@ function wp_read_audio_metadata( $file )
- 	}
- 
- 	if ( ! class_exists( 'getID3', false ) ) {
--		require( ABSPATH . WPINC . '/ID3/getid3.php' );
-+		require( '/usr/share/php/getid3/getid3.php' );
- 	}
- 	$id3  = new getID3();
- 	$data = $id3->analyze( $file );

wordpress-5.2-noupdate.patch

@@ -1,74 +0,0 @@
-diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php
---- wordpress/wp-admin/includes/admin-filters.php.rpm	2019-03-28 15:12:21.157820497 +0100
-+++ wordpress/wp-admin/includes/admin-filters.php	2019-03-28 15:12:41.792928559 +0100
-@@ -116,7 +116,6 @@ add_action( 'personal_options_update', '
- add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
- add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
- 
--add_action( 'admin_notices', 'update_nag', 3 );
- add_action( 'admin_notices', 'paused_plugins_notice', 5 );
- add_action( 'admin_notices', 'paused_themes_notice', 5 );
- add_action( 'admin_notices', 'maintenance_nag', 10 );
-diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php
---- wordpress/wp-admin/includes/class-core-upgrader.php.rpm	2019-03-28 00:05:54.000000000 +0100
-+++ wordpress/wp-admin/includes/class-core-upgrader.php	2019-03-28 15:12:21.157820497 +0100
-@@ -269,6 +269,9 @@ class Core_Upgrader extends WP_Upgrader
- 	 * @return bool True if we should update to the offered version, otherwise false.
- 	 */
- 	public static function should_update_to_version( $offered_ver ) {
-+		// RPM: nether allow core update
-+		return false;
-+
- 		include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
- 
- 		$current_branch                 = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y
-diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php
---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm	2018-08-30 15:36:25.000000000 +0200
-+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2019-03-28 15:12:21.158820502 +0100
-@@ -38,7 +38,7 @@ class WP_Automatic_Updater {
- 		}
- 
- 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
--		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
-+		$disabled = !defined( 'AUTOMATIC_UPDATER_DISABLED' ) || AUTOMATIC_UPDATER_DISABLED;
- 
- 		/**
- 		 * Filters whether to entirely disable background updates.
-diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php
---- wordpress/wp-admin/includes/update.php.rpm	2019-03-22 02:08:51.000000000 +0100
-+++ wordpress/wp-admin/includes/update.php	2019-03-28 15:12:21.158820502 +0100
-@@ -301,7 +301,7 @@ function update_right_now_message() {
- 		$cur = get_preferred_from_update_core();
- 
- 		if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
--			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
-+			$msg .= '';
- 		}
- 	}
- 
-diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
---- wordpress/wp-includes/load.php.rpm	2019-03-27 01:03:51.000000000 +0100
-+++ wordpress/wp-includes/load.php	2019-03-28 15:12:21.158820502 +0100
-@@ -1418,7 +1418,7 @@ function wp_is_file_mod_allowed( $contex
- 	 * @param bool   $file_mod_allowed Whether file modifications are allowed.
- 	 * @param string $context          The usage context.
- 	 */
--	return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context );
-+	return apply_filters( 'file_mod_allowed', defined( 'DISALLOW_FILE_MODS' ) && ! DISALLOW_FILE_MODS, $context );
- }
- 
- /**
-diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
---- wordpress/wp-includes/update.php.rpm	2019-01-16 04:38:49.000000000 +0100
-+++ wordpress/wp-includes/update.php	2019-03-28 15:12:21.158820502 +0100
-@@ -770,10 +770,6 @@ function _maybe_update_themes() {
-  * @since 3.1.0
-  */
- function wp_schedule_update_checks() {
--	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) {
--		wp_schedule_event( time(), 'twicedaily', 'wp_version_check' );
--	}
--
- 	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) {
- 		wp_schedule_event( time(), 'twicedaily', 'wp_update_plugins' );
- 	}

wordpress-5.3-mediaelement_no_swf.patch

@@ -0,0 +1,38 @@
+diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js
+--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no	2019-10-08 18:06:02.000000000 +0200
++++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js	2019-11-13 07:59:39.418787150 +0100
+@@ -6410,6 +6410,7 @@ if (hasFlash) {
+ 		}
+ 	});
+ 
++/* swf files removed from RPM
+ 	var FlashMediaElementVideoRenderer = {
+ 		name: 'flash_video',
+ 		options: {
+@@ -6494,6 +6495,7 @@ if (hasFlash) {
+ 		create: FlashMediaElementRenderer.create
+ 	};
+ 	_renderer.renderer.add(FlashMediaElementAudioOggRenderer);
++*/
+ }
+ 
+ },{"10":10,"2":2,"27":27,"29":29,"3":3,"30":30,"7":7,"9":9}],23:[function(_dereq_,module,exports){
+diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.no wordpress/wp-includes/js/mediaelement/mediaelement.js
+--- wordpress/wp-includes/js/mediaelement/mediaelement.js.no	2019-10-08 18:06:02.000000000 +0200
++++ wordpress/wp-includes/js/mediaelement/mediaelement.js	2019-11-13 07:59:45.601728069 +0100
+@@ -2108,6 +2108,7 @@ if (hasFlash) {
+ 		}
+ 	});
+ 
++/* swf files removed from RPM
+ 	var FlashMediaElementVideoRenderer = {
+ 		name: 'flash_video',
+ 		options: {
+@@ -2192,6 +2193,7 @@ if (hasFlash) {
+ 		create: FlashMediaElementRenderer.create
+ 	};
+ 	_renderer.renderer.add(FlashMediaElementAudioOggRenderer);
++*/
+ }
+ 
+ },{"10":10,"18":18,"2":2,"20":20,"21":21,"3":3,"7":7,"9":9}],14:[function(_dereq_,module,exports){

wordpress-5.4-config.patch

@@ -1,6 +1,6 @@
-diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
+diff -up wordpress/wp-config.php.old wordpress/wp-config.php
---- wordpress/wp-config.php.orig	2019-02-21 15:07:29.558863904 +0100
+--- wordpress/wp-config.php.old	2020-03-25 16:41:04.241482906 +0100
-+++ wordpress/wp-config.php	2019-02-21 15:07:37.024901925 +0100
++++ wordpress/wp-config.php	2020-03-25 16:42:03.677209804 +0100
 @@ -66,6 +66,19 @@ define( 'NONCE_SALT',       'put your un
  $table_prefix = 'wp_';
  
@@ -25,7 +25,7 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php
  
  /** Absolute path to the WordPress directory. */
  if ( ! defined( 'ABSPATH' ) ) {
--	define( 'ABSPATH', dirname( __FILE__ ) . '/' );
+-	define( 'ABSPATH', __DIR__ . '/' );
 +	define('ABSPATH', '/usr/share/wordpress');
  }
  

wordpress-5.4-no_swfupload.patch

@@ -1,11 +1,11 @@
-diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php
+diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php
---- wordpress/wp-includes/script-loader.php.orig	2019-02-21 14:57:23.338776485 +0100
+--- wordpress/wp-includes/script-loader.php.old	2020-03-25 16:34:50.606199762 +0100
-+++ wordpress/wp-includes/script-loader.php	2019-02-21 14:57:25.832789185 +0100
++++ wordpress/wp-includes/script-loader.php	2020-03-25 16:35:59.409883628 +0100
-@@ -1098,12 +1098,6 @@ function wp_default_scripts( &$scripts )
+@@ -892,12 +892,6 @@ function wp_default_scripts( $scripts )
  	$scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 );
  	did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
  
--	// keep 'swfupload' for back-compat.
+-	// Keep 'swfupload' for back-compat.
 -	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' );
 -	$scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' );
 -	$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' );

wordpress-5.4-noupdate.patch

@@ -0,0 +1,79 @@
+diff -up wordpress/wp-admin/includes/admin-filters.php.old wordpress/wp-admin/includes/admin-filters.php
+--- wordpress/wp-admin/includes/admin-filters.php.old	2020-01-29 01:45:18.000000000 +0100
++++ wordpress/wp-admin/includes/admin-filters.php	2020-03-25 16:44:02.126665533 +0100
+@@ -111,7 +111,6 @@ add_action( 'personal_options_update', '
+ add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
+ add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
+ 
+-add_action( 'admin_notices', 'update_nag', 3 );
+ add_action( 'admin_notices', 'paused_plugins_notice', 5 );
+ add_action( 'admin_notices', 'paused_themes_notice', 5 );
+ add_action( 'admin_notices', 'maintenance_nag', 10 );
+diff -up wordpress/wp-admin/includes/class-core-upgrader.php.old wordpress/wp-admin/includes/class-core-upgrader.php
+--- wordpress/wp-admin/includes/class-core-upgrader.php.old	2020-03-25 16:44:02.126665533 +0100
++++ wordpress/wp-admin/includes/class-core-upgrader.php	2020-03-25 16:44:38.649497710 +0100
+@@ -270,6 +270,9 @@ class Core_Upgrader extends WP_Upgrader
+ 	 * @return bool True if we should update to the offered version, otherwise false.
+ 	 */
+ 	public static function should_update_to_version( $offered_ver ) {
++		// RPM: nether allow core update
++		return false;
++
+ 		require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
+ 
+ 		$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y
+diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.old wordpress/wp-admin/includes/class-wp-automatic-updater.php
+--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.old	2020-02-09 17:55:09.000000000 +0100
++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2020-03-25 16:44:02.126665533 +0100
+@@ -38,7 +38,7 @@ class WP_Automatic_Updater {
+ 		}
+ 
+ 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
+-		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
++		$disabled = !defined( 'AUTOMATIC_UPDATER_DISABLED' ) || AUTOMATIC_UPDATER_DISABLED;
+ 
+ 		/**
+ 		 * Filters whether to entirely disable background updates.
+diff -up wordpress/wp-admin/includes/update.php.old wordpress/wp-admin/includes/update.php
+--- wordpress/wp-admin/includes/update.php.old	2020-03-25 16:44:02.127665528 +0100
++++ wordpress/wp-admin/includes/update.php	2020-03-25 16:45:28.396269123 +0100
+@@ -338,12 +338,7 @@ function update_right_now_message() {
+ 		$cur = get_preferred_from_update_core();
+ 
+ 		if ( isset( $cur->response ) && 'upgrade' === $cur->response ) {
+-			$msg .= sprintf(
+-				'<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
+-				network_admin_url( 'update-core.php' ),
+-				/* translators: %s: WordPress version number, or 'Latest' string. */
+-				sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) )
+-			);
++			$msg .= '';
+ 		}
+ 	}
+ 
+diff -up wordpress/wp-includes/load.php.old wordpress/wp-includes/load.php
+--- wordpress/wp-includes/load.php.old	2020-02-25 19:33:06.000000000 +0100
++++ wordpress/wp-includes/load.php	2020-03-25 16:44:02.127665528 +0100
+@@ -1435,7 +1435,7 @@ function wp_is_file_mod_allowed( $contex
+ 	 * @param bool   $file_mod_allowed Whether file modifications are allowed.
+ 	 * @param string $context          The usage context.
+ 	 */
+-	return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context );
++	return apply_filters( 'file_mod_allowed', defined( 'DISALLOW_FILE_MODS' ) && ! DISALLOW_FILE_MODS, $context );
+ }
+ 
+ /**
+diff -up wordpress/wp-includes/update.php.old wordpress/wp-includes/update.php
+--- wordpress/wp-includes/update.php.old	2020-02-10 04:30:06.000000000 +0100
++++ wordpress/wp-includes/update.php	2020-03-25 16:44:02.127665528 +0100
+@@ -782,10 +782,6 @@ function _maybe_update_themes() {
+  * @since 3.1.0
+  */
+ function wp_schedule_update_checks() {
+-	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) {
+-		wp_schedule_event( time(), 'twicedaily', 'wp_version_check' );
+-	}
+-
+ 	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) {
+ 		wp_schedule_event( time(), 'twicedaily', 'wp_update_plugins' );
+ 	}

wordpress-5.4-systemlibs.patch

@@ -0,0 +1,21 @@
+diff -up wordpress/wp-admin/includes/media.php.old wordpress/wp-admin/includes/media.php
+--- wordpress/wp-admin/includes/media.php.old	2020-03-25 16:39:05.484028608 +0100
++++ wordpress/wp-admin/includes/media.php	2020-02-11 00:47:04.000000000 +0100
+@@ -3477,7 +3477,7 @@ function wp_read_video_metadata( $file )
+ 	}
+ 
+ 	if ( ! class_exists( 'getID3', false ) ) {
+-		require ABSPATH . WPINC . '/ID3/getid3.php';
++		require '/usr/share/php/getid3/getid3.php';
+ 	}
+ 
+ 	$id3  = new getID3();
+@@ -3588,7 +3588,7 @@ function wp_read_audio_metadata( $file )
+ 	}
+ 
+ 	if ( ! class_exists( 'getID3', false ) ) {
+-		require ABSPATH . WPINC . '/ID3/getid3.php';
++		require '/usr/share/php/getid3/getid3.php';
+ 	}
+ 
+ 	$id3  = new getID3();

wordpress.spec

@@ -13,14 +13,9 @@
 %else
 %global with_nginx 0
 %endif
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
+%global upstream_version 5.5.3
-%global clean_compat 1
+#global upstream_prever  RC5
-%else
+#global upstream_lower   rc5
-%global clean_compat 0
-%endif
-%global upstream_version 5.2.3
-#global upstream_prever  RC1
-#global upstream_lower   rc1
 
 Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
@@ -44,24 +39,24 @@ Patch0: wordpress-5.2-hello.patch
 # This patch doesn’t work well, see bugzilla.redhat.com/522897
 Patch1: wordpress-move-wp-content.patch
 # Drop swfupload: not built from source, not reasonably possible to do
-Patch2: wordpress-5.1-no_swfupload.patch
+Patch2: wordpress-5.4-no_swfupload.patch
 # Adjust tinymce's media plugin not to use its SWF plugin. This changes
 # 'p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"))'
 # to 'false'
 Patch3: wordpress-5.1-tinymce_noflash.patch
 # We drop the SWF files from mediaelement
-Patch4: wordpress-4.9-mediaelement_no_swf.patch
+Patch4: wordpress-5.3-mediaelement_no_swf.patch
 # RPM configuration:
 # Path to installation
 # Disable auto-updater
-Patch5: wordpress-5.1-config.patch
+Patch5: wordpress-5.4-config.patch
 # RPM are readonly
 # disable version check and updated
 # change DISALLOW_FILE_MODS default value to true
 # ignore WP_AUTO_UPDATE_CORE (always false)
-Patch6: wordpress-5.2-noupdate.patch
+Patch6: wordpress-5.4-noupdate.patch
 # Use system libraries
-Patch7: wordpress-5.1-systemlibs.patch
+Patch7: wordpress-5.4-systemlibs.patch
 # Debian patch for jshint
 Patch8: wordpress-5.1-remove-jshint-refs.patch
 
@@ -69,11 +64,7 @@ Patch8: wordpress-5.1-remove-jshint-refs.patch
 BuildArch: noarch
 BuildRequires: php-cli
 BuildRequires: php-patchwork-jsqueeze
-%if %{clean_compat}
 BuildRequires: php(language) >= 7.2
-%else
-BuildRequires: php(language) >= 5.6.20
-%endif
 
 %if %{with_nginx}
 Requires: webserver
@@ -85,12 +76,8 @@ Requires: nginx-filesystem
 %else
 Requires: php
 %endif
-%if %{clean_compat}
 Requires: php(language) >= 7.2
 Requires: php-sodium
-%else
-Requires: php(language) >= 5.6.20
-%endif
 Requires: php-simplepie >= 1.3.1
 Requires: php-getid3
 Requires: php-ctype
@@ -120,7 +107,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}
@@ -142,12 +129,10 @@ rm -rf wp-includes/js/swfupload
 # remove .htaccess, protected by httpd config file
 rm wp-content/plugins/akismet/.htaccess
 
-%if %{clean_compat}
 # only for PHP < 7.0 without random_int
 rm -rf wp-includes/random_compat
 # only for PHP < 7.2 without sodium_crypto_box
 rm -rf wp-includes/sodium_compat
-%endif
 
 %patch0 -p1 -b .dolly
 #patch1 -p1 -b .rhbz522897
@@ -234,12 +219,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
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer
-for fic in phpmailer smtp; do
+ln -s /usr/share/php/PHPMailer/PHPMailer6 \
-  rm     ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
+      ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer
-  ln -sf /usr/share/php/PHPMailer/class.$fic.php \
-         ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
-done
 
 # Remove bundled php-getid3
 rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3
@@ -296,6 +278,40 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Sat Oct 31 2020 Remi Collet <remi@remirepo.net> - 5.5.3-1
+- WordPress 5.5.3 Maintenance Release
+
+* Fri Oct 30 2020 Remi Collet <remi@remirepo.net> - 5.5.2-1
+- WordPress 5.5.2 Security and Maintenance Release
+
+* Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 5.5.1-1
+- WordPress 5.5.1 Maintenance Release
+
+* 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
+
+* Thu Apr 30 2020 Remi Collet <remi@remirepo.net> - 5.4.1-1
+- WordPress 5.4.1 Security and Maintenance Release
+
+* Wed Apr  1 2020 Remi Collet <remi@remirepo.net> - 5.4-1
+- WordPress 5.4 “Adderley”
+
+* Thu Dec 19 2019 Remi Collet <remi@remirepo.net> - 5.3.2-1
+- WordPress 5.3.2 Maintenance Release
+
+* Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 5.3.1-1
+- WordPress 5.3.1 Security and Maintenance Release
+
+* Wed Nov 13 2019 Remi Collet <remi@remirepo.net> - 5.3-1
+- WordPress 5.3 “Kirk”
+
+* Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 5.2.4-1
+- WordPress 5.2.4 Security Release
+
 * Thu Sep  5 2019 Remi Collet <remi@remirepo.net> - 5.2.3-1
 - WordPress 5.2.3 Security and Maintenance Release