[wordpress/f17: 14/14] Merge branch 'master' into f17

[Nick Bebout]

commit cffcd49dc0d3d8ff93e09d6c8e61eb4ce9e26d9a
Merge: 29f3a6c db29684
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Jan 11 17:34:25 2013 -0600

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	wordpress.spec

 .gitignore           |   35 +++++++++++++++++++++++++++++++++++
 wordpress-httpd-conf |   11 +++++++++++
 wordpress.spec       |   46 +++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 85 insertions(+), 7 deletions(-)
---
diff --cc wordpress.spec
index aa7e082,aabc907..a167571
--- a/wordpress.spec
+++ b/wordpress.spec
@@@ -102,13 -103,18 +103,22 @@@ find ${RPM_BUILD_ROOT} -type f -empty -
  rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html}
  
  # Remove bundled php-simplepie and link to system copy
- 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
+ rm -f  ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
+ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie
+ 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
+ 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
 +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
@@@ -157,9 -170,28 +174,24 @@@ rm -rf ${RPM_BUILD_ROOT
  * Wed Dec 12 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-1
  - New upstream release.
  
- * Mon Oct 29 2012 Remi Collet <rcollet at redhat.com> - 3.5-0.3.beta2
- - use system PHPMailer
- - requires needed php extensions
+ * Tue Dec 04 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.5.RC3
+ - New upstream release candidate.
+ 
+ * Fri Nov 30 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.5.RC2
+ - New upstream release candidate.
+ 
+ * Sat Nov 24 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.5.RC1
+ - New upstream release candidate.
+ 
+ * Tue Nov 13 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.4.beta3
+ - New upstream beta3 version
+ 
 -* Mon Oct 29 2012 Remi Collet <rcollet at redhat.com> - 3.5-0.3.beta2
 -- use system PHPMailer
 -- requires needed php extensions
 -
+ * Sat Oct 13 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.2.beta2
+ - New upstream beta2 version
+ 
+ * Thu Oct 04 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.2.beta1
+ - New upstream beta1 version
+ - Don’t even bother with removing gettext.php ... it is not used anymore
  
  * Thu Sep 06 2012 Matej Cepl <mcepl at redhat.com> - 3.4.2-2
  - Upstream security update.