diff --git a/.gitignore b/.gitignore
index c88f993..caa1e80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clog
/wordpress-*.tar.gz
/wordpress-4.9.2-strip.tar.xz
/wordpress-4.9.4-strip.tar.xz
+/wordpress-4.9.5-strip.tar.xz
diff --git a/sources b/sources
index ca33443..f6747ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-4.9.4-strip.tar.xz) = 11be065f84087a41303fc4afa77426fc722a4baba3099b7d2c4998476c64bc9d6c5142a1143f75051f36b55f884fc30a8bc71135afab67dc38a7dcc845d5cf68
+SHA512 (wordpress-4.9.5-strip.tar.xz) = 5b763b833c9e6758a86b2eecd0cd74e5a7671851351eb7bb56454b15611f9b12bfda6181e2df09cad485611ce5f32e61dcd9b86906e32afe95b86b0077876a4a
diff --git a/wordpress-debian_patches_hello.patch b/wordpress-debian_patches_hello.patch
index 8555d70..7dd9faa 100644
--- a/wordpress-debian_patches_hello.patch
+++ b/wordpress-debian_patches_hello.patch
@@ -1,13 +1,14 @@
---- wordpress/wp-content/plugins/hello.php 2013-05-22 14:08:40.000000000 -0700
-+++ wordpress/wp-content/plugins/hello.php.new 2013-08-22 23:46:04.594788007 -0700
-@@ -6,42 +6,26 @@
+diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugins/hello.php
+--- wordpress/wp-content/plugins/hello.php.dolly 2018-04-04 08:17:16.113486189 +0200
++++ wordpress/wp-content/plugins/hello.php 2018-04-04 08:17:34.599563913 +0200
+@@ -6,41 +6,26 @@
/*
Plugin Name: Hello Dolly
Plugin URI: http://wordpress.org/plugins/hello-dolly/
-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.6
+ Version: 1.7
Author URI: http://ma.tt/
*/
@@ -20,12 +21,11 @@
-I can tell, Dolly
-You're still glowin', you're still crowin'
-You're still goin' strong
--We feel the room swayin'
+-I feel the room swayin'
-While the band's playin'
--One of your old favourite songs from way back when
+-One of our old favorite songs from way back when
-So, take her wrap, fellas
--Find her an empty lap, fellas
--Dolly'll 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
@@ -33,16 +33,16 @@
-I can tell, Dolly
-You're still glowin', you're still crowin'
-You're still goin' strong
--We feel the room swayin'
+-I feel the room swayin'
-While the band's playin'
--One of your old favourite songs from way back when
--Golly, gee, fellas
--Find her a vacant knee, fellas
--Dolly'll never go away
--Dolly'll never go away
+-One of our old favorite songs from way back when
+-So, golly, gee, fellas
+-Have a little faith in me, fellas
+-Dolly, never go away
+-Promise, you'll never go away
-Dolly'll never go away again";
+ // These are the lyrics to the Free Software Song
-+$lyrics = "Join us now and share the software;
++ $lyrics = "Join us now and share the software;
+You'll be free, hackers, you'll be free.
+Hoarders may get piles of money,
+That is true, hackers, that is true.
diff --git a/wordpress.spec b/wordpress.spec
index fe0ba5f..fb5613a 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -8,7 +8,7 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global wp_content %{_datadir}/wordpress/wp-content
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
%global with_nginx 1
%else
%global with_nginx 0
@@ -19,7 +19,7 @@
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
-Version: 4.9.4
+Version: 4.9.5
Group: Applications/Publishing
Release: 1%{?dist}
License: GPLv2
@@ -234,16 +234,16 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
-print -delete
## Move wp-content directory to /var/www location
-#mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress
-#mv -v ${RPM_BUILD_ROOT}%{wp_content}/ \
-# ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress
+#mkdir -p ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress
+#mv -v ${RPM_BUILD_ROOT}%%{wp_content}/ \
+# ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress
-#%post
+#%%post
#if [ $1 -eq 2 ] ; then
## In case user has old wp-content from previous version, move it to
## the new location.
-#mv -uf %{wp_content}/* %{_localstatedir}/www/wordpress/
-#/sbin/restorecon -R %{_localstatedir}/www/wordpress/
+#mv -uf %%{wp_content}/* %%{_localstatedir}/www/wordpress/
+#/sbin/restorecon -R %%{_localstatedir}/www/wordpress/
#fi
@@ -276,6 +276,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
%changelog
+* Wed Apr 4 2018 Remi Collet - 4.9.5-1
+- WordPress 4.9.5 Security and Maintenance Release
+
* Wed Feb 7 2018 Remi Collet - 4.9.4-1
- WordPress 4.9.4 Maintenance Release