From d4453b59cce4f1c1930529ab3336f7b30eaf9e11 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Jan 2013 17:20:15 +0100 Subject: [PATCH] fix simplepie links (for all branches) --- wordpress.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 0e8629a..9c79024 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ Name: wordpress Version: 3.5.1 Group: Applications/Publishing #Release: 0.5.%{betatag}%{?dist} -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -106,9 +106,14 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} # Remove bundled php-simplepie and link to system copy -rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php -# This is specific to simple 1.1 in EL-5 -ln -sf /usr/share/php/php-simplepie/simplepie.inc ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php +rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie +%if 0%{?rhel} == 5 +ln -sf /usr/share/php/php53-simplepie/autoloader.php \ +%else +ln -sf /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 for fic in phpmailer smtp pop3; do @@ -162,6 +167,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Jan 30 2013 Remi Collet - 3.5.1-1.1 +- fix simplepie links (for all branches) + * Wed Jan 30 2013 Remi Collet - 3.5.1-1 - version 3.5.1, various bug and security fixes: CVE-2013-0235, CVE-2013-0236 and CVE-2013-0237