Merge branch 'el6' into el5

.gitignore

@@ -7,3 +7,6 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.1.2.tar.gz
 /wordpress-3.1.3.tar.gz
 /wordpress-3.1.4.tar.gz
+/wordpress-3.2-RC1.zip
+/wordpress-3.2-RC3.zip
+/wordpress-3.2.tar.gz

sources

@@ -1 +1 @@
-b6289783d88c965986a918e3d940e05e  wordpress-3.1.4.tar.gz
+55fa6c8a79771ed258b6671a12be594e  wordpress-3.2.tar.gz

wordpress.spec

@@ -1,7 +1,7 @@
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.1.4
+Version: 3.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -14,9 +14,6 @@ Source3: README.fedora.wordpress-mu
 Patch0: wordpress-debian_patches_hello.patch
 # Move wp-content to /var/www/wordpress/
 Patch1: wordpress-move-wp-content.patch
-# Fix FSF address (again) ... patch posted upstream
-# http://core.trac.wordpress.org/ticket/14967
-Patch2: wordpress-FSF-address.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie
 Provides: wordpress-mu = %{version}-%{release}
@@ -32,7 +29,6 @@ almost trivial, to get information out to people on the web.
 
 %patch0 -p1 -b .dolly
 #%patch1 -p1 -b .rhbz522897
-%patch2 -p1 -b .FSFaddr
 
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
@@ -107,6 +103,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Jul 05 2011 Matěj Cepl <mcepl@redhat.com> - 3.2-1
+- New upstream release.
+
 * Wed Jun 29 2011 Matěj Cepl <mcepl@redhat.com> - 3.1.4-1
 - New upstream security release.