From c2ef7c643d8c5bb10a42e5db655ee70b4eb53703 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 Feb 2018 06:52:12 +0100 Subject: [PATCH] WordPress 4.9.4 Maintenance Release (cherry picked from commit 74877a4e71ab6c4a885e27978ff955afadf2b0ab) --- .gitignore | 1 + sources | 2 +- ...-refs.patch => wordpress-4.9.4-remove-jshint-refs.patch | 4 ++-- wordpress.spec | 7 +++++-- 4 files changed, 9 insertions(+), 5 deletions(-) rename wordpress-4.9-remove-jshint-refs.patch => wordpress-4.9.4-remove-jshint-refs.patch (95%) diff --git a/.gitignore b/.gitignore index 2aa2f42..c88f993 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /wordpress-*.tar.gz /wordpress-4.9.2-strip.tar.xz +/wordpress-4.9.4-strip.tar.xz diff --git a/sources b/sources index 211a927..ca33443 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.2-strip.tar.xz) = a61f292f1721a7fbf78d510b75831a2e842c67600b2625b8ef6bf1b282efecabb8615175a67b71af9636a778515c3c48b521096a3e962fef11e71b1a1d4d6a7b +SHA512 (wordpress-4.9.4-strip.tar.xz) = 11be065f84087a41303fc4afa77426fc722a4baba3099b7d2c4998476c64bc9d6c5142a1143f75051f36b55f884fc30a8bc71135afab67dc38a7dcc845d5cf68 diff --git a/wordpress-4.9-remove-jshint-refs.patch b/wordpress-4.9.4-remove-jshint-refs.patch similarity index 95% rename from wordpress-4.9-remove-jshint-refs.patch rename to wordpress-4.9.4-remove-jshint-refs.patch index 245039b..41b59ae 100644 --- a/wordpress-4.9-remove-jshint-refs.patch +++ b/wordpress-4.9.4-remove-jshint-refs.patch @@ -9,11 +9,11 @@ Reviewed-by: Craig Small Last-Update: 2017-12-09 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php -@@ -467,7 +467,6 @@ +@@ -461,7 +461,6 @@ $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); -- $scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5' ); +- $scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5.999' ); $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index 781823b..9c0f185 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,7 +19,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.9.2 +Version: 4.9.4 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -60,7 +60,7 @@ Patch6: wordpress-4.9-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch # Debian patch for jshint -Patch8: wordpress-4.9-remove-jshint-refs.patch +Patch8: wordpress-4.9.4-remove-jshint-refs.patch BuildArch: noarch @@ -276,6 +276,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Feb 7 2018 Remi Collet - 4.9.4-1 +- WordPress 4.9.4 Maintenance Release + * Wed Jan 17 2018 Remi Collet - 4.9.2-1 - WordPress 4.9.2 Security and Maintenance Release - drop non-free jshint.js file #1528765