[wordpress/f18: 13/14] Merge branch 'master' into f18

[Nick Bebout]

commit 7fa7a022efe3e1e8cbb09fa6dcda31aa2ff2c7b2
Merge: 4c00505 b25e975
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 18 20:24:59 2012 -0600

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

 .gitignore           |   38 ++++++++++++++++++++++++++++++++++++++
 wordpress-httpd-conf |   11 +++++++++++
 wordpress.spec       |   39 +++++++++++++++++++++++++++++++++++----
 3 files changed, 84 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 4f114c6,a7c0e8b..4d66b47
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,36 +1,39 @@@
++<<<<<<< HEAD
++=======
+ wordpress-3.0.1.tar.gz
+ /wordpress-3.0.2.tar.gz
+ /wordpress-3.0.3.tar.gz
+ /wordpress-3.0.4.tar.gz
+ /wordpress-3.1.tar.gz
+ /wordpress-3.1.1.tar.gz
+ /wordpress-3.1.2.tar.gz
+ /wordpress-3.1.3.tar.gz
+ /wordpress-3.2-RC1.zip
+ /wordpress-3.2-RC3.zip
+ /wordpress-3.2.tar.gz
+ /wordpress-3.2.1.tar.gz
+ /wordpress-3.3-beta2.tar.gz
+ /wordpress-3.3-beta3.tar.gz
+ /wordpress-3.3-beta4.tar.gz
+ /wordpress-3.3-RC1.tar.gz
+ /wordpress-3.3-RC2.tar.gz
+ /wordpress-3.3.tar.gz
+ /wordpress-3.3.1.tar.gz
+ /wordpress-3.4-beta1.tar.gz
+ /wordpress-3.4-beta2.tar.gz
+ /wordpress-3.4-beta3.tar.gz
+ /wordpress-3.4-beta4.tar.gz
+ /wordpress-3.4-RC1.tar.gz
+ /wordpress-3.4-RC2.tar.gz
+ /wordpress-3.4-RC3.tar.gz
+ /wordpress-3.4.tar.gz
+ /wordpress-3.4.1.tar.gz
+ /wordpress-3.4.2.tar.gz
+ /wordpress-3.5-beta-1.tar.gz
+ /wordpress-3.5-beta2.tar.gz
+ /wordpress-3.5-beta3.tar.gz
+ /wordpress-3.5-RC1.tar.gz
+ /wordpress-3.5-RC2.tar.gz
+ /wordpress-3.5-RC3.tar.gz
++>>>>>>> master
  /wordpress-3.5.tar.gz
diff --cc wordpress.spec
index 5750940,68fdfee..86d5949
--- a/wordpress.spec
+++ b/wordpress.spec
@@@ -102,13 -103,15 +103,19 @@@ 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
+ 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 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
@@@ -161,6 -180,13 +184,14 @@@ rm -rf ${RPM_BUILD_ROOT
  - 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
+ 
++>>>>>>> master
  * Thu Sep 06 2012 Matej Cepl <mcepl at redhat.com> - 3.4.2-2
  - Upstream security update.