From 7fff699c8934505aed8cad6e518f298b22aca3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
Date: Wed, 29 Jun 2011 21:30:31 +0200
Subject: [PATCH 1/3] New upstream release.

---
 wordpress.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wordpress.spec b/wordpress.spec
index 051c85e..9cf4af2 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,9 +1,9 @@
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.1.3
+Version: 3.1.4
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -107,6 +107,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Jun 29 2011 Matěj Cepl <mcepl@redhat.com> - 3.1.4-1
+- New upstream security release.
+
 * Thu Jun 02 2011 Matěj Cepl <mcepl@redhat.com> - 3.1.3-3
 - Actually, we just don't need gettext.php at all, it is provided by
   php itself. Just remove the file, don't make a symlink.

From 73aa093c0ffe903c4a352c93a740e720128a4773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
Date: Wed, 29 Jun 2011 21:32:43 +0200
Subject: [PATCH 2/3] Actually don't forget to add new sources.

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 336fc17..d002ba8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.1.1.tar.gz
 /wordpress-3.1.2.tar.gz
 /wordpress-3.1.3.tar.gz
+/wordpress-3.1.4.tar.gz
diff --git a/sources b/sources
index ad6311b..7124a48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd0323f13f5b1c44636bb3db5ca1c717  wordpress-3.1.3.tar.gz
+b6289783d88c965986a918e3d940e05e  wordpress-3.1.4.tar.gz

From ef7ca4bf10b38ec327636cef1a90643b3b195955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
Date: Wed, 13 Jun 2012 22:50:30 +0200
Subject: [PATCH 3/3] 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@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