From 7f7bae9ea49e174b5b618a6e5f28e1729e06bf99 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Mar 2016 14:59:17 +0100 Subject: [PATCH] WordPress 4.5 Release Candidate --- ...date.patch => wordpress-4.5-noupdate.patch | 32 +++++++++++++++---- wordpress.spec | 12 ++++--- 2 files changed, 34 insertions(+), 10 deletions(-) rename wordpress-4.4-noupdate.patch => wordpress-4.5-noupdate.patch (78%) diff --git a/wordpress-4.4-noupdate.patch b/wordpress-4.5-noupdate.patch similarity index 78% rename from wordpress-4.4-noupdate.patch rename to wordpress-4.5-noupdate.patch index d02cf71..f4a64c5 100644 --- a/wordpress-4.4-noupdate.patch +++ b/wordpress-4.5-noupdate.patch @@ -12,7 +12,7 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/i diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.orig wordpress/wp-admin/includes/class-wp-upgrader.php --- wordpress/wp-admin/includes/class-wp-upgrader.php.orig 2015-11-16 03:47:25.000000000 +0100 +++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-12-09 17:09:34.735571806 +0100 -@@ -2386,6 +2386,9 @@ class Core_Upgrader extends WP_Upgrader +@@ -2465,6 +2465,9 @@ class Core_Upgrader extends WP_Upgrader } } @@ -22,7 +22,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.orig wordpress/wp-adm // 1: If we're already on that version, not much point in updating? if ( $offered_ver == $wp_version ) return false; -@@ -2627,7 +2630,7 @@ class WP_Automatic_Updater { +@@ -2706,7 +2709,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -46,7 +46,7 @@ diff -up wordpress/wp-admin/includes/update.php.orig wordpress/wp-admin/includes diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capabilities.php --- wordpress/wp-includes/capabilities.php.orig 2015-11-29 03:27:18.000000000 +0100 +++ wordpress/wp-includes/capabilities.php 2015-12-09 17:08:00.946112235 +0100 -@@ -308,7 +308,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -310,7 +310,7 @@ function map_meta_cap( $cap, $user_id ) // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) $caps[] = 'do_not_allow'; @@ -55,7 +55,7 @@ diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capab $caps[] = 'do_not_allow'; elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; -@@ -326,7 +326,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -328,7 +328,7 @@ function map_meta_cap( $cap, $user_id ) case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. @@ -67,7 +67,7 @@ diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capab diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php --- wordpress/wp-includes/update.php.orig 2015-12-06 16:44:27.000000000 +0100 +++ wordpress/wp-includes/update.php 2015-12-09 17:12:09.038327895 +0100 -@@ -637,9 +637,6 @@ function _maybe_update_themes() { +@@ -653,9 +653,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { @@ -77,7 +77,7 @@ diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -681,8 +678,6 @@ if ( ( ! is_main_site() && ! is_network_ +@@ -683,8 +680,6 @@ if ( ( ! is_main_site() && ! is_network_ } add_action( 'admin_init', '_maybe_update_core' ); @@ -86,3 +86,23 @@ diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php add_action( 'load-plugins.php', 'wp_update_plugins' ); add_action( 'load-update.php', 'wp_update_plugins' ); +--- wordpress/wp-admin/includes/translation-install.php.orig 2016-03-25 14:48:58.616147092 +0100 ++++ wordpress/wp-admin/includes/translation-install.php 2016-03-25 14:50:43.841612441 +0100 +@@ -181,7 +181,7 @@ function wp_download_language_pack( $dow + return $download; + } + +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + return false; + } + +@@ -224,7 +224,7 @@ function wp_download_language_pack( $dow + * @return bool Returns true on success, false on failure. + */ + function wp_can_install_language_pack() { +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + return false; + } + diff --git a/wordpress.spec b/wordpress.spec index 7c42dd9..2a8efae 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,16 +19,17 @@ %else %global with_getid3 0 %endif +%global prever RC1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.4.2 +Version: 4.5 Group: Applications/Publishing -Release: 1%{?dist} +Release: 0.1.%{prever}%{?dist} License: GPLv2 -Source0: http://wordpress.org/%{name}-%{version}.tar.gz +Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu @@ -53,7 +54,7 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.4-noupdate.patch +Patch6: wordpress-4.5-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch @@ -287,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Mar 25 2016 Remi Collet - 4.5-0.1.RC1 +- WordPress 4.5 Release Candidate + * Wed Feb 3 2016 Remi Collet - 4.4.2-1 - WordPress 4.4.2 Security and Maintenance Release