Merge branch 'master' into el6

Conflicts:
	wordpress.spec

.gitignore

@@ -1,3 +1,5 @@
 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

README.fedora.wordpress-mu

@@ -0,0 +1,5 @@
+As of wordpress 3.0.x, upstream has deprecated wordpress-mu.  This 
+functionality has been included in mainline wordpress.  For 
+information on migrating from wordpress-mu, visit 
+http://codex.wordpress.org/Migrating_Multiple_Blogs_into_WordPress_3.0_Multisite
+

sources

@@ -1 +1 @@
-c9f2c1db36a78d62596bc97d90bf00ae  wordpress-3.0.3.tar.gz
+b8a701bbcb3fdd5829fec5d90f223b56  wordpress-3.1.tar.gz

wordpress-debian_patches_hello.patch

@@ -1,14 +1,13 @@
-Use GPL-compliant lyrics in the hello dolly plugin
---- a/wp-content/plugins/hello.php
-+++ b/wp-content/plugins/hello.php
+--- wordpress/wp-content/plugins/hello.php~	2010-11-10 06:43:04.000000000 -0600
++++ wordpress/wp-content/plugins/hello.php	2011-02-23 10:10:52.152777012 -0600
 @@ -6,42 +6,26 @@
  /*
  Plugin Name: Hello Dolly
- Plugin URI: http://wordpress.org/#
+ Plugin URI: http://wordpress.org/extend/plugins/hello-dolly/
 -Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
 +Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the <cite>Free Software Song</cite> in the upper right of your admin screen on every page.
  Author: Matt Mullenweg
- Version: 1.5.1
+ Version: 1.6
  Author URI: http://ma.tt/
  */
  
@@ -57,4 +56,4 @@ Use GPL-compliant lyrics in the hello dolly plugin
 +You'll be free, hackers, you'll be free.";
  
  	// Here we split it into lines
- 	$lyrics = explode("\n", $lyrics);
+ 	$lyrics = explode( "\n", $lyrics );

wordpress.spec

@@ -1,16 +1,18 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.0.3
+Version: 3.1
 Group: Applications/Publishing
-Release: 2.1%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
+Source3: README.fedora.wordpress-mu
 Patch0: wordpress-debian_patches_hello.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie
+Obsoletes: wordpress-mu
 BuildArch: noarch
 
 %description
@@ -41,6 +43,7 @@ cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress
 	${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php
 /bin/ln -sf ../../../etc/wordpress/wp-config.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-config.php
 /bin/cp %{SOURCE2} ./README.fedora
+/bin/cp %{SOURCE3} ./README.fedora-multiuser
 # Remove empty files to make rpmlint happy
 find ${RPM_BUILD_ROOT} -type f -empty -exec rm -f {} \;
 # These are docs, remove them from here, docify them later
@@ -68,6 +71,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc license.txt
 %doc readme.html
 %doc README.fedora
+%doc README.fedora-multiuser
 %{_datadir}/wordpress/wp-atom.php
 %{_datadir}/wordpress/wp-app.php
 %{_datadir}/wordpress/wp-blog-header.php
@@ -95,8 +99,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/wordpress/wp-signup.php
 
 %changelog
-* Thu Dec 23 2010 Jon Ciesla <limb@jcomserv.net> - 3.0.3-2.1
-- EVR bump.
+* Wed Feb 23 2011 Jon Ciesla <limb@jcomserv.net> - 3.1-1
+- 3.1.
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 03 2011 Jon Ciesla <limb@jcomserv.net> - 3.0.4-2
+- Obsoletes wordpress-mu, deprecated by upstream as of 3.0.x.
+
+* Mon Jan 03 2011 Jon Ciesla <limb@jcomserv.net> - 3.0.4-1
+- 3.0.4. Security fixes, BZ 666782.
 
 * Thu Dec 23 2010 Jon Ciesla <limb@jcomserv.net> - 3.0.3-2
 - Change Requires from httpd to webserver, BZ 523480.