[wordpress/f18] provides POP3 class #905867

[Remi Collet]

commit 79c1bf8ea5c3090dec3c13f1f078820724e1be16
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Feb 12 12:04:03 2013 +0100

    provides POP3 class #905867

 wordpress.spec |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/wordpress.spec b/wordpress.spec
index 96de685..a4e2624 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: 2%{?dist}
 License: GPLv2
 #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
@@ -24,7 +24,8 @@ 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
 Requires: php-simplepie >= 1.3.1
@@ -109,11 +110,16 @@ 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 -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
+# 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
@@ -164,6 +170,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Feb 12 2013 Remi Collet <rcollet at redhat.com> - 3.5.1-2
+- provides POP3 class #905867
+  POP3 is not from PHPMailer, but from SquirrelMail
+- fix simplepie links (for all branches)
+
 * Wed Jan 30 2013 Remi Collet <rcollet at redhat.com> - 3.5.1-1
 - version 3.5.1, various bug and security fixes:
   CVE-2013-0235, CVE-2013-0236 and CVE-2013-0237