Merge branch 'master' into f18

This commit is contained in:
Nick Bebout 2013-01-11 17:32:58 -06:00
commit d3c4c429ab

View file

@ -7,7 +7,7 @@ Name: wordpress
Version: 3.5
Group: Applications/Publishing
#Release: 0.5.%{betatag}%{?dist}
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
#Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
@ -109,8 +109,11 @@ 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
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/
for fic in phpmailer smtp pop3; do
rm -f ${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
done
# Remove bundled PHPMailer and link to system one
rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-{phpmailer,smtp,pop3}.php
@ -161,6 +164,9 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_sysconfdir}/wordpress
%changelog
* Mon Jan 2 2013 Remi Collet <rcollet@redhat.com> - 3.5-3
- fix links to system PHPMailer library
* Sun Dec 16 2012 Remi Collet <rcollet@redhat.com> - 3.5-2
- fix use of system Simplepie
- give access from local (httpd 2.4)