From a036eddc5f684fcd9481aaffcac531f87f37c141 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 09:23:40 +0100 Subject: [PATCH 1/9] fix wp-tinymce.js.gz is empty #1691524 --- wordpress.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 1efe528..f8ba33a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -148,22 +148,6 @@ php %{SOURCE5} \ wp-includes/js/mediaelement/mediaelement.js \ wp-includes/js/mediaelement/mediaelement.min.js -# Re-Generated the archive -arc=wp-includes/js/tinymce/wp-tinymce.js -gunzip -dc $arc.gz | \ - grep "^// Source" | \ - while read a b c -do - if [ -f $c ]; then - echo -e "\n$a $b $c" - cat $c - else - exit 1 - fi -done >$arc -gzip --force $arc -ls -l $arc.gz - # Create RPM configuration sed -e 's/\r//' wp-config-sample.php >wp-config.php %patch5 -p1 @@ -271,6 +255,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Mar 22 2019 Remi Collet - 5.1.1-2 +- fix wp-tinymce.js.gz is empty #1691524 + * Wed Mar 13 2019 Remi Collet - 5.1.1-1 - WordPress 5.1.1 Security and Maintenance Release From 56508b8b2164d451e77216c9f3df6e3dedf29ff8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 09:55:59 +0100 Subject: [PATCH 2/9] fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 --- wordpress.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index f8ba33a..095201f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -148,6 +148,24 @@ php %{SOURCE5} \ wp-includes/js/mediaelement/mediaelement.js \ wp-includes/js/mediaelement/mediaelement.min.js +# Re-Generated the archive +arc=wp-includes/js/tinymce/wp-tinymce.js +grep "^// Source" $arc | while read a b c +do + if [ -f $c ]; then + echo -e "\n$a $b $c" + cat $c + else + exit 1 + fi +done >$arc.tmp +if [ -s $arc.tmp ]; then + ls -l $arc* + mv $arc.tmp $arc +else + exit 1 +fi + # Create RPM configuration sed -e 's/\r//' wp-config-sample.php >wp-config.php %patch5 -p1 @@ -255,8 +273,8 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog -* Fri Mar 22 2019 Remi Collet - 5.1.1-2 -- fix wp-tinymce.js.gz is empty #1691524 +* Fri Mar 22 2019 Remi Collet - 5.1.1-3 +- fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 * Wed Mar 13 2019 Remi Collet - 5.1.1-1 - WordPress 5.1.1 Security and Maintenance Release From b91aee8a754f3e1f3a203a83912511196bf5202f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 10:03:35 +0100 Subject: [PATCH 3/9] also add wp-tinymce.js.gz (cherry picked from commit dec03d96ab4c62b9ce5e0ef8f988560e0c571328) --- wordpress.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wordpress.spec b/wordpress.spec index 095201f..1ced21f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -160,6 +160,7 @@ do fi done >$arc.tmp if [ -s $arc.tmp ]; then + gzip -c $arc > $arc.gz ls -l $arc* mv $arc.tmp $arc else From 6005fbcc0c00bf44e541381f9c8d369cb9fce540 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 10:06:22 +0100 Subject: [PATCH 4/9] bump release --- wordpress.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 1ced21f..2858235 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -274,7 +274,7 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog -* Fri Mar 22 2019 Remi Collet - 5.1.1-3 +* Fri Mar 22 2019 Remi Collet - 5.1.1-4 - fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 * Wed Mar 13 2019 Remi Collet - 5.1.1-1 From 7fdeb1ba1d372b07c6f2f0be0aef5ce3b7ed3569 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Mar 2019 15:25:28 +0100 Subject: [PATCH 5/9] WordPress 5.2 Beta 1 raise dependency on PHP 7.2 --- sources | 1 + ...s_hello.patch => wordpress-5.2-hello.patch | 12 +++--- ...date.patch => wordpress-5.2-noupdate.patch | 32 +++++++-------- wordpress.spec | 41 +++++++++++++++---- 4 files changed, 56 insertions(+), 30 deletions(-) rename wordpress-debian_patches_hello.patch => wordpress-5.2-hello.patch (86%) rename wordpress-5.1-noupdate.patch => wordpress-5.2-noupdate.patch (75%) diff --git a/sources b/sources index fd32428..3276186 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (wordpress-5.1.1.tar.gz) = 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9 +SHA512 (wordpress-5.2-beta1.tar.gz) = 58f76bddcb600f0dcc0cccbd52e799581614d88c8aae76e441fc9fe512a1a591a4b62b2f88a5b0023985ce3b26b7d6f3b22de86f308fa6a62c884a0c6478d2e4 diff --git a/wordpress-debian_patches_hello.patch b/wordpress-5.2-hello.patch similarity index 86% rename from wordpress-debian_patches_hello.patch rename to wordpress-5.2-hello.patch index 65fd0d3..5ccc2f5 100644 --- a/wordpress-debian_patches_hello.patch +++ b/wordpress-5.2-hello.patch @@ -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 Hello, Dolly 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 Free Software Song 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 ); diff --git a/wordpress-5.1-noupdate.patch b/wordpress-5.2-noupdate.patch similarity index 75% rename from wordpress-5.1-noupdate.patch rename to wordpress-5.2-noupdate.patch index 70350e7..68f6fb7 100644 --- a/wordpress-5.1-noupdate.patch +++ b/wordpress-5.2-noupdate.patch @@ -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 */ diff --git a/wordpress.spec b/wordpress.spec index 2858235..510e955 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -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 - 5.2.0~beta1-1 +- WordPress 5.2 Beta 1 +- raise dependency on PHP 7.2 + * Fri Mar 22 2019 Remi Collet - 5.1.1-4 - fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 From 997262dc34a39d29803fabc927c4824f28c9719c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 Apr 2019 11:38:24 +0200 Subject: [PATCH 6/9] WordPress 5.2 Beta 2 --- sources | 3 +-- wordpress.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 3276186..134ce84 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (wordpress-5.1.1.tar.gz) = 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9 -SHA512 (wordpress-5.2-beta1.tar.gz) = 58f76bddcb600f0dcc0cccbd52e799581614d88c8aae76e441fc9fe512a1a591a4b62b2f88a5b0023985ce3b26b7d6f3b22de86f308fa6a62c884a0c6478d2e4 +SHA512 (wordpress-5.2-beta2.tar.gz) = e41be5f91fa0c722a66d74b1f71155522c0ab10792c86109bd6362f1a306b61f2ac62565b2979bd68a413ce11aec07292239f139e9dc5516f1adcb3df365612f diff --git a/wordpress.spec b/wordpress.spec index 510e955..c28d43f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,7 +19,7 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever beta1 +%global upstream_prever beta2 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -71,7 +71,7 @@ BuildRequires: php-patchwork-jsqueeze %if %{clean_compat} BuildRequires: php(language) >= 7.2 %else -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 5.6.20 %endif %if %{with_nginx} @@ -88,7 +88,7 @@ Requires: php Requires: php(language) >= 7.2 Requires: php-sodium %else -Requires: php(language) >= 5.6 +Requires: php(language) >= 5.6.20 %endif Requires: php-simplepie >= 1.3.1 Requires: php-getid3 @@ -295,6 +295,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Apr 9 2019 Remi Collet - 5.2.0~beta2-1 +- WordPress 5.2 Beta 2 + * Thu Mar 28 2019 Remi Collet - 5.2.0~beta1-1 - WordPress 5.2 Beta 1 - raise dependency on PHP 7.2 From 6d87ba89c33d458214cf2aa6843bce326f15720f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Apr 2019 10:31:29 +0200 Subject: [PATCH 7/9] WordPress 5.2 Beta 3 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 134ce84..98919df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2-beta2.tar.gz) = e41be5f91fa0c722a66d74b1f71155522c0ab10792c86109bd6362f1a306b61f2ac62565b2979bd68a413ce11aec07292239f139e9dc5516f1adcb3df365612f +SHA512 (wordpress-5.2-beta3.tar.gz) = afca3568d30ec8ab4f2e1390f561b7050497749e37a3ba4f4dc9e6653d2c2f013a701004b01e5079a47edbab66f9e6bb6eb9aeebc719cace6f95c0ad42579f52 diff --git a/wordpress.spec b/wordpress.spec index c28d43f..5ae829c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,7 +19,7 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever beta2 +%global upstream_prever beta3 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -295,6 +295,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Apr 17 2019 Remi Collet - 5.2.0~beta3-1 +- WordPress 5.2 Beta 3 + * Tue Apr 9 2019 Remi Collet - 5.2.0~beta2-1 - WordPress 5.2 Beta 2 From bf063620ff588303485dfd4fdf8766fd02cd1bcb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 26 Apr 2019 10:12:58 +0200 Subject: [PATCH 8/9] WordPress 5.2 RC 1 --- sources | 2 +- wordpress.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 98919df..8b0920f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2-beta3.tar.gz) = afca3568d30ec8ab4f2e1390f561b7050497749e37a3ba4f4dc9e6653d2c2f013a701004b01e5079a47edbab66f9e6bb6eb9aeebc719cace6f95c0ad42579f52 +SHA512 (wordpress-5.2-RC1.tar.gz) = 909b4a815ba6a241ab806165b91abb413801e84aa25bd26e655e525d4d78bc48f8a98153957088e8c606f2e8351cee07a17bdec7efad9d23222b2271440ae907 diff --git a/wordpress.spec b/wordpress.spec index 5ae829c..2a4da82 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,12 +19,13 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever beta3 +%global upstream_prever RC1 +%global upstream_lower rc1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} +Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} Release: 1%{?dist} License: GPLv2 @@ -295,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Apr 26 2019 Remi Collet - 5.2.0~rc1-1 +- WordPress 5.2 RC 1 + * Wed Apr 17 2019 Remi Collet - 5.2.0~beta3-1 - WordPress 5.2 Beta 3 From 916ff3a68e8fcedee677ee0796ec4114f487c102 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 May 2019 07:54:33 +0200 Subject: [PATCH 9/9] =?UTF-8?q?WordPress=205.2=20=E2=80=9CJaco=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 8b0920f..86563e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2-RC1.tar.gz) = 909b4a815ba6a241ab806165b91abb413801e84aa25bd26e655e525d4d78bc48f8a98153957088e8c606f2e8351cee07a17bdec7efad9d23222b2271440ae907 +SHA512 (wordpress-5.2.tar.gz) = 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824 diff --git a/wordpress.spec b/wordpress.spec index 2a4da82..010ba93 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,8 +19,8 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever RC1 -%global upstream_lower rc1 +#global upstream_prever RC1 +#global upstream_lower rc1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed May 8 2019 Remi Collet - 5.2.0-1 +- WordPress 5.2 “Jaco” + * Fri Apr 26 2019 Remi Collet - 5.2.0~rc1-1 - WordPress 5.2 RC 1