[wordpress/f17: 3/3] fix merge issue
Remi Collet
remi at fedoraproject.org
Wed Jan 30 14:57:30 UTC 2013
commit fd22341ed579c4b52d7c2009f4ab2afce493265b
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed Jan 30 14:20:59 2013 +0100
fix merge issue
wordpress.spec | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/wordpress.spec b/wordpress.spec
index 2bb2785..2a511ac 100644
--- 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
More information about the scm-commits
mailing list