[wordpress/f15] New upstream release

[Matej Cepl]

commit ef7ca4bf10b38ec327636cef1a90643b3b195955
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jun 13 22:50:30 2012 +0200

    New upstream release
    
    Conflicts:
    	.gitignore
    	sources
    	wordpress.spec

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |   15 +++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b9ac54c..59fb246 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,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
diff --git a/sources b/sources
index 1ade4fb..22cfaf4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb38fa2bcde3b144e1a7fb096cd597a1  wordpress-3.3.2.tar.gz
+e080b6761c61c0f0f2b75d2bb5a7d0c9  wordpress-3.4.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index 57f89e5..db2ba64 100644
--- a/wordpress.spec
+++ b/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 at 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 at redhat.com>' - 3.3.2-2
 - Security updates for uploading files.
   * Fixed CVE-2011-0700: two XSS bug. Affects users of the Author