[wordpress/f14/master: 9/9] Merge branch 'f15' into f14

[Jon Ciesla]

commit 95570ae12297ba3f9947a9fbe2beada0e4f5742d
Merge: 4985115 eb53a6a
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Mar 21 09:22:31 2011 -0500

    Merge branch 'f15' into f14
    
    Conflicts:
    	wordpress-debian_patches_hello.patch
    	wordpress.spec

 .gitignore                           |    5 +++
 README.fedora.wordpress-mu           |    5 +++
 sources                              |    2 +-
 wordpress-debian_patches_hello.patch |   11 +++---
 wordpress.spec                       |   67 +++++++++++++++++++++++++++++-----
 5 files changed, 73 insertions(+), 17 deletions(-)
---
diff --cc wordpress.spec
index 6d98d00,63a07cb..710c531
--- a/wordpress.spec
+++ b/wordpress.spec
@@@ -88,16 -95,39 +95,56 @@@ rm -rf ${RPM_BUILD_ROOT
  %{_datadir}/wordpress/wp-trackback.php
  %{_datadir}/wordpress/xmlrpc.php
  %dir %{_sysconfdir}/wordpress
+ %{_datadir}/wordpress/wp-activate.php
+ %{_datadir}/wordpress/wp-signup.php
  
  %changelog
++<<<<<<< HEAD
++* Mon Jan 03 2011 Jon Ciesla <limb at jcomserv.net> - 2.8.6-4
++- Patch for security vulnerability, BZ 666782.
++
++* Thu Dec 23 2010 Jon Ciesla <limb at jcomserv.net> - 2.8.6-3
++- Change Requires from httpd to webserver, BZ 523480.
++- Patch for Hello Dolly lyrics, BZ 663966.
++- Patch for security vulnerability, BZ 659319.
++
+ * Wed Feb 23 2011 Jon Ciesla <limb at jcomserv.net> - 3.1-1
+ - 3.1.
+ 
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.4-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Mon Jan 03 2011 Jon Ciesla <limb at jcomserv.net> - 3.0.4-2
+ - Obsoletes wordpress-mu, deprecated by upstream as of 3.0.x.
+ 
+ * Mon Jan 03 2011 Jon Ciesla <limb at jcomserv.net> - 3.0.4-1
+ - 3.0.4. Security fixes, BZ 666782.
+ 
+ * Thu Dec 23 2010 Jon Ciesla <limb at jcomserv.net> - 3.0.3-2
+ - Change Requires from httpd to webserver, BZ 523480.
+ - Patch for Hello Dolly lyrics, BZ 663966.
+ 
+ * Fri Dec 10 2010 Jon Ciesla <limb at jcomserv.net> - 3.0.3-1
+ - 3.0.3. Security fixes, BZ 659319.
+ 
+ * Fri Dec 10 2010 Jon Ciesla <limb at jcomserv.net> - 3.0.2-1
+ - 3.0.2. Security fixes, BZ 659319.
+ 
+ * Mon Aug 09 2010 Jon Ciesla <limb at jcomserv.net> - 3.0.1-1
+ - 3.0.1.
+ 
 +* Mon Jan 03 2011 Jon Ciesla <limb at jcomserv.net> - 2.8.6-4
 +- Patch for security vulnerability, BZ 666782.
 +
 +* Thu Dec 23 2010 Jon Ciesla <limb at jcomserv.net> - 2.8.6-3
 +- Change Requires from httpd to webserver, BZ 523480.
 +- Patch for Hello Dolly lyrics, BZ 663966.
 +- Patch for security vulnerability, BZ 659319.
 +
+ * Mon Jul 12 2010 Jon Ciesla <limb at jcomserv.net> - 2.8.6-3
+ - Remove bundled php-gettext and php-simplepie,
+ - require and link to system versions, BZ 544720.
+ 
  * Mon Nov 16 2009 Adrian Reber <adrian at lisas.de> - 2.8.6-2
  - updated to 2.8.6 (Security Release)