remi pushed to wordpress (epel7). "update to 4.1.2 (security) (..more)"

[notifications at fedoraproject.org]

>From b44429cab92070b1ef53168959afc57f1dc0ee95 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Thu, 23 Apr 2015 13:18:18 +0200
Subject: update to 4.1.2 (security)

(cherry picked from commit 146dfc159681c93d5760a199cf9e70257cfc7441)

diff --git a/.gitignore b/.gitignore
index 719ea7a..463c1b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
 /wordpress-4.0.1.tar.gz
 /wordpress-4.1.tar.gz
 /wordpress-4.1.1.tar.gz
+/wordpress-4.1.2.tar.gz
diff --git a/sources b/sources
index 80218b0..013331d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcf6532a859ad86d532259b18d78c5cb  wordpress-4.1.1.tar.gz
+266abe568f3f1a82aba0b0aac3e11d16  wordpress-4.1.2.tar.gz
diff --git a/wordpress-4.1-noupdate.patch b/wordpress-4.1-noupdate.patch
index 9578b76..5105c23 100644
--- a/wordpress-4.1-noupdate.patch
+++ b/wordpress-4.1-noupdate.patch
@@ -65,7 +65,7 @@ diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabi
 diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
 --- wordpress/wp-includes/update.php.rpm	2014-12-22 06:48:34.883575009 +0100
 +++ wordpress/wp-includes/update.php	2014-12-22 06:48:44.144609988 +0100
-@@ -626,9 +626,6 @@ function _maybe_update_themes() {
+@@ -624,9 +624,6 @@ function _maybe_update_themes() {
   * @since 3.1.0
   */
  function wp_schedule_update_checks() {
@@ -75,7 +75,7 @@ diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
  	if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
  		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
  
-@@ -671,8 +668,6 @@ if ( ( ! is_main_site() && ! is_network_
+@@ -669,8 +666,6 @@ if ( ( ! is_main_site() && ! is_network_
  }
  
  add_action( 'admin_init', '_maybe_update_core' );
diff --git a/wordpress.spec b/wordpress.spec
index 619d416..2c09797 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -16,7 +16,7 @@
 Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
-Version:    4.1.1
+Version:    4.1.2
 Group:      Applications/Publishing
 Release:    1%{?dist}
 License:    GPLv2
@@ -281,6 +281,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Thu Apr 23 2015 Remi Collet <remi at fedoraproject.org> - 4.1.2-1
+- WordPress 4.1.2 Security Release
+
 * Thu Feb 19 2015 Remi Collet <remi at fedoraproject.org> - 4.1.1-1
 - WordPress 4.1.1 Maintenance Release
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/wordpress.git/commit/?h=epel7&id=b44429cab92070b1ef53168959afc57f1dc0ee95