From 3ee3520d0aa8175653a71304da35d5e098284052 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Oct 2012 15:08:13 +0100 Subject: [PATCH] use system PHPMailer requires needed php extensions --- wordpress.spec | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index b679c1e..98d72fc 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -6,7 +6,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.5 Group: Applications/Publishing -Release: 0.2.%{betatag}%{?dist} +Release: 0.3.%{betatag}%{?dist} #Release: 3%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz @@ -20,10 +20,39 @@ Patch0: wordpress-debian_patches_hello.patch Patch1: wordpress-move-wp-content.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?rhel} == 5 -Requires: php53 >= 5.2.4, php53-mysql, php53-simplepie +Requires: php53 >= 5.2.4, php53-simplepie %else -Requires: php >= 5.2.4, php-mysql, php-simplepie +Requires: php >= 5.2.4, php-simplepie %endif +# Required php extension (detected by phpci) +Requires: php-curl +Requires: php-date +Requires: php-dom +Requires: php-enchant +# not yet available for RHEL Requires: php-ereg +Requires: php-exif +Requires: php-fileinfo +# not yet available for RHEL Requires: php-filter +Requires: php-gettext +Requires: php-hash +Requires: php-iconv +Requires: php-json +Requires: php-libxml +Requires: php-mbstring +Requires: php-mysql +Requires: php-openssl +Requires: php-pcre +Requires: php-pdo +Requires: php-posix +Requires: php-reflection +Requires: php-simplexml +Requires: php-sockets +Requires: php-spl +Requires: php-tokenizer +Requires: php-zip +Requires: php-zlib +# Unbundled libraries +Requires: php-PHPMailer Requires: webserver Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -74,6 +103,10 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php ln -sf /usr/share/php/php-simplepie/simplepie.inc ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php +# Remove bundled PHPMailer and link to system one +rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-{phpmailer,smtp,pop3}.php +ln -sf /usr/share/php/PHPMailer/*php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ + # Remove backup copies of patches find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \ -print -delete @@ -119,6 +152,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Oct 29 2012 Remi Collet - 3.5-0.3.beta2 +- use system PHPMailer +- requires needed php extensions + * Sat Oct 13 2012 Matěj Cepl - 3.5-0.2.beta2 - New upstream beta2 version