diff --git a/.gitignore b/.gitignore index ad4dbd7..cf51623 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ clog /wordpress-4.7.2.tar.gz /wordpress-4.7.3.tar.gz /wordpress-4.7.4.tar.gz +/wordpress-4.7.5.tar.gz diff --git a/sources b/sources index 78b310c..c840d3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.7.4.tar.gz) = 9d1b7fa2688e80d8e8409bd9f7fa61007b266de70a11eaa592fc737c501906e9c14b20eab63542077acb8dd65f5491f481b0945f5ed9e98d8b5207a47c3ec950 +SHA512 (wordpress-4.7.5.tar.gz) = 7d6e4feaf95c49ec7e68068687a399145613d90b5867616ac7a324c60f9107f2453c9f745a455b94e84ef12b191cb2ac67e6b4dd3b8f669e344ea63afc6988ca diff --git a/wordpress.spec b/wordpress.spec index 42905d3..6a582ae 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -14,18 +14,12 @@ %global with_nginx 0 %endif -# https://bugzilla.redhat.com/1147817 php53-getid3 review -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 -%global with_getid3 1 -%else -%global with_getid3 0 -%endif #global prever RC1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.7.4 +Version: 4.7.5 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -60,18 +54,8 @@ Patch6: wordpress-4.6-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -%if 0%{?rhel} == 5 -Requires: php53 >= 5.2.4 -Requires: php53-simplepie >= 1.3.1 -%if %{with_getid3} -Requires: php53-getid3 -%endif -Requires: php53-mysql - -%else %if %{with_nginx} Requires: webserver Requires: php(httpd) @@ -84,13 +68,10 @@ Requires: nginx-filesystem Requires: php >= 5.2.4 %endif Requires: php-simplepie >= 1.3.1 -%if %{with_getid3} Requires: php-getid3 -%endif Requires: php-ctype Requires: php-filter Requires: php-mysqli -%endif # From phpcompatinfo report for version 4.5.3 Requires: php-curl @@ -167,9 +148,7 @@ rm wp-content/plugins/akismet/.htaccess # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' sed -s 's/"flash","silverlight",//' -i wp-includes/js/mediaelement/mediaelement-and-player.min.js -%if %{with_getid3} %patch7 -p1 -%endif # We patch a .js file, used patched file instead of unpatch minified one ln -sf plugin.js wp-includes/js/tinymce/plugins/media/plugin.min.js @@ -231,11 +210,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} # Remove bundled php-simplepie and link to system copy rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie -%if 0%{?rhel} == 5 -ln -s /usr/share/php/php53-simplepie/autoloader.php \ -%else ln -s /usr/share/php/php-simplepie/autoloader.php \ -%endif ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php # Remove bundled PHPMailer and link to system one @@ -246,10 +221,8 @@ for fic in phpmailer smtp; do ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php done -%if %{with_getid3} # Remove bundled php-getid3 rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3 -%endif # Remove bundled ca-bundle.crt rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt @@ -274,11 +247,7 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig #fi -%clean -rm -rf ${RPM_BUILD_ROOT} - %files -%defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress.conf %if %{with_nginx} %config(noreplace) %{_sysconfdir}/nginx/default.d/wordpress.conf @@ -307,6 +276,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed May 17 2017 Remi Collet - 4.7.5-1 +- WordPress 4.7.5 Security and Maintenance Release + * Sat Apr 22 2017 Kevin Fenzi - 4.7.4-1 - Update to 4.7.4. Maintenance Release.