Merge branch 'f17' into el6

.gitignore

@@ -1,21 +1 @@
-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
-/wordpress-3.1.1.tar.gz
-/wordpress-3.1.2.tar.gz
-/wordpress-3.1.3.tar.gz
-/wordpress-3.1.4.tar.gz
-/wordpress-3.2.tar.gz
-/wordpress-3.2.1.tar.gz
-/wordpress-3.3-beta2.tar.gz
-/wordpress-3.3-beta3.tar.gz
-/wordpress-3.3-beta4.tar.gz
-/wordpress-3.3-RC1.tar.gz
-/wordpress-3.3-RC2.tar.gz
-/wordpress-3.3.tar.gz
-/wordpress-3.3.1.tar.gz
-/wordpress-3.3.2.tar.gz
-/wordpress-3.4.tar.gz
-/wordpress-3.4.1.tar.gz
+/wordpress-3.4.2.tar.gz

sources

@@ -1 +1 @@
-5f6c1dcbe0b8031235f107b7479d30a5  wordpress-3.4.1.tar.gz
+dfc56cee27eec8fb79070f033ecd4b25  wordpress-3.4.2.tar.gz

wordpress.spec

@@ -4,10 +4,10 @@
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.4.1
+Version: 3.4.2
 Group: Applications/Publishing
 #Release: 0.2.%{betatag}%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}%{?betatag}.tar.gz
 Source1: wordpress-httpd-conf
@@ -117,6 +117,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Sep 06 2012 Matej Cepl <mcepl@redhat.com> - 3.4.2-2
+- Upstream security update.
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Thu Jun 28 2012 Matej Cepl <mcepl@redhat.com> - 3.4.1-1
 - New upstream release. Just improvements and security issues.