Merge branch 'f15' into el6

.gitignore

@@ -7,8 +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
 /wordpress-3.2.1.tar.gz
 /wordpress-3.3-beta2.tar.gz
@@ -19,3 +17,4 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.3.tar.gz
 /wordpress-3.3.1.tar.gz
 /wordpress-3.3.2.tar.gz
+/wordpress-3.4.tar.gz

sources

@@ -1 +1 @@
-bb38fa2bcde3b144e1a7fb096cd597a1  wordpress-3.3.2.tar.gz
+e080b6761c61c0f0f2b75d2bb5a7d0c9  wordpress-3.4.tar.gz

wordpress.spec

@@ -1,14 +1,15 @@
 %global wp_content %{_datadir}/wordpress/wp-content
-%global betatag RC2
+#%#global betatag -RC3
 
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.3.2
+Version: 3.4
 Group: Applications/Publishing
-Release: 2%{?dist}
+#Release: 0.2.%{betatag}%{?dist}
+Release: 1%{?dist}
 License: GPLv2
-Source0: http://wordpress.org/%{name}-%{version}.tar.gz
+Source0: http://wordpress.org/%{name}-%{version}%{?betatag}.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
 Source3: README.fedora.wordpress-mu
@@ -116,6 +117,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Jun 13 2012 Matej Cepl <mcepl@redhat.com> - 3.4-1
+- New upstream release. The main changes from the upstream
+  release notes:
+  * theme customizer
+  * XML-RPC themes and API improvements
+
 * Mon Apr 23 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.2-2
 - Security updates for uploading files.
   * Fixed CVE-2011-0700: two XSS bug. Affects users of the Author