rpms/wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WordPress 5.2 Beta 1

Browse source 
raise dependency on PHP 7.2
This commit is contained in:
Remi Collet 2019-03-28 15:25:28 +01:00
commit 7fdeb1ba1d
4 changed files with 56 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sources
View file

@ -1 +1,2 @@
SHA512 (wordpress-5.1.1.tar.gz) = 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9
SHA512 (wordpress-5.2-beta1.tar.gz) = 58f76bddcb600f0dcc0cccbd52e799581614d88c8aae76e441fc9fe512a1a591a4b62b2f88a5b0023985ce3b26b7d6f3b22de86f308fa6a62c884a0c6478d2e4

12
wordpress-debian_patches_hello.patch → wordpress-5.2-hello.patch
View file

@ -1,6 +1,6 @@
diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php
--- ./wp-content/plugins/hello.php.dolly 2018-11-16 00:38:48.000000000 +0100
+++ ./wp-content/plugins/hello.php 2018-12-12 13:54:41.867980830 +0100
diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugins/hello.php
--- wordpress/wp-content/plugins/hello.php.dolly 2019-03-28 15:09:05.874797878 +0100
+++ wordpress/wp-content/plugins/hello.php 2019-03-28 15:10:15.892164549 +0100
@@ -6,41 +6,26 @@
/*
Plugin Name: Hello Dolly
@ -8,7 +8,7 @@ diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php
-Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
+Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the <cite>Free Software Song</cite> in the upper right of your admin screen on every page.
Author: Matt Mullenweg
Version: 1.7.1
Version: 1.7.2
Author URI: http://ma.tt/
*/
@ -25,7 +25,7 @@ diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php
-While the band's playin'
-One of our old favorite songs from way back when
-So, take her wrap, fellas
-Dolly, never go away again
-Dolly, never go away again
-Hello, Dolly
-Well, hello, Dolly
-It's so nice to have you back where you belong
@ -55,5 +55,5 @@ diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php
+Join us now and share the software;
+You'll be free, hackers, you'll be free.";
// Here we split it into lines
// Here we split it into lines.
$lyrics = explode( "\n", $lyrics );

32
wordpress-5.1-noupdate.patch → wordpress-5.2-noupdate.patch
View file

@ -1,18 +1,18 @@
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-02-21 15:14:36.864022775 +0100
+++ wordpress/wp-admin/includes/admin-filters.php 2019-02-21 15:14:46.729070707 +0100
--- 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 );
add_filter( 'update_footer', 'core_update_footer' );
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-02-21 15:14:36.864022775 +0100
+++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-02-21 15:14:46.729070707 +0100
@@ -250,6 +250,9 @@ class Core_Upgrader extends WP_Upgrader
--- 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 ) {
@ -23,8 +23,8 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-ad
$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 2019-02-21 15:14:36.864022775 +0100
+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-02-21 15:14:46.729070707 +0100
--- 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 {
}
@ -35,8 +35,8 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpres
/**
* 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-02-21 15:14:36.865022780 +0100
+++ wordpress/wp-admin/includes/update.php 2019-02-21 15:14:46.729070707 +0100
--- 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();
@ -47,9 +47,9 @@ diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/
}
diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
--- wordpress/wp-includes/load.php.rpm 2019-01-30 12:01:52.000000000 +0100
+++ wordpress/wp-includes/load.php 2019-02-21 15:14:36.865022780 +0100
@@ -1259,7 +1259,7 @@ function wp_is_file_mod_allowed( $contex
--- 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.
*/
@ -59,8 +59,8 @@ diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
/**
diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.rpm 2019-02-21 15:14:36.865022780 +0100
+++ wordpress/wp-includes/update.php 2019-02-21 15:16:50.428671765 +0100
--- 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
*/

41
wordpress.spec
View file

@ -13,15 +13,19 @@
%else
%global with_nginx 0
%endif
%global upstream_version 5.1.1
#global upstream_prever RC2
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
%global clean_compat 1
%else
%global clean_compat 0
%endif
%global upstream_version 5.2
%global upstream_prever beta1
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
Version: %{upstream_version}%{?upstream_prever:~%upstream_prever}
Release: 4%{?dist}
Release: 1%{?dist}
License: GPLv2
Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz
@ -34,7 +38,7 @@ Source5: wordpress-minify.php
# Patch out copyrighted text of Hello, Dolly
# (and replace it with Free Software Song)
Patch0: wordpress-debian_patches_hello.patch
Patch0: wordpress-5.2-hello.patch
# Move wp-content to /var/www/wordpress/
# This patch doesn’t work well, see bugzilla.redhat.com/522897
Patch1: wordpress-move-wp-content.patch
@ -54,7 +58,7 @@ Patch5: wordpress-5.1-config.patch
# disable version check and updated
# change DISALLOW_FILE_MODS default value to true
# ignore WP_AUTO_UPDATE_CORE (always false)
Patch6: wordpress-5.1-noupdate.patch
Patch6: wordpress-5.2-noupdate.patch
# Use system libraries
Patch7: wordpress-5.1-systemlibs.patch
# Debian patch for jshint
@ -64,6 +68,11 @@ 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
%endif
%if %{with_nginx}
Requires: webserver
@ -72,9 +81,14 @@ Suggests: httpd
# For directory ownership
Requires: httpd-filesystem
Requires: nginx-filesystem
%else
Requires: php >= 5.2.4
Requires: php
%endif
%if %{clean_compat}
Requires: php(language) >= 7.2
Requires: php-sodium
%else
Requires: php(language) >= 5.6
%endif
Requires: php-simplepie >= 1.3.1
Requires: php-getid3
@ -127,6 +141,13 @@ 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
%patch2 -p1
@ -274,6 +295,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
%changelog
* Thu Mar 28 2019 Remi Collet <remi@remirepo.net> - 5.2.0~beta1-1
- WordPress 5.2 Beta 1
- raise dependency on PHP 7.2
* Fri Mar 22 2019 Remi Collet <remi@remirepo.net> - 5.1.1-4
- fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524