From 0da83deed573808eba6c4bf92a14bfae1aaa4619 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Feb 2013 12:26:56 +0100 Subject: [PATCH] provides POP3 class #905867 --- wordpress.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 9c79024..d1b6286 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}.1 +Release: 2%{?dist} License: GPLv2 #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -24,9 +24,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if 0%{?rhel} == 5 -Requires: php53 >= 5.2.4, php53-simplepie +Requires: php53 >= 5.2.4 +Requires: php53-simplepie >= 1.3.1 %else -Requires: php >= 5.2.4, php-simplepie +Requires: php >= 5.2.4 +Requires: php-simplepie >= 1.3.1 %endif # Required php extension (detected by phpci) Requires: php-curl @@ -116,7 +118,8 @@ ln -sf /usr/share/php/php-simplepie/autoloader.php \ ${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 +# Note POP3 is not from PHPMailer but from SquirrelMail +for fic in phpmailer smtp; do rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php ln -sf /usr/share/php/PHPMailer/class.$fic.php \ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php @@ -167,6 +170,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Feb 12 2013 Remi Collet - 3.5.1-2 +- provides POP3 class #905867 + POP3 is not from PHPMailer, but from SquirrelMail + * Wed Jan 30 2013 Remi Collet - 3.5.1-1.1 - fix simplepie links (for all branches)