fix merge issue

2013-01-30 14:20:59 +01:00 · 2013-01-30 14:20:59 +01:00 · adaf81ee88
commit adaf81ee88
parent 8d804758fb
1 changed files with 0 additions and 4 deletions
--- a/wordpress.spec
+++ b/wordpress.spec
@ -119,10 +119,6 @@ for fic in phpmailer smtp pop3; do
         ${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
-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