[wordpress/el6: 9/9] Merge branch 'master' into el6

[Matej Cepl]

commit ced29c5fe9f3d234288df8c103f7a89b9365114b
Merge: 5f21926 2fb094f
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Dec 13 00:52:52 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	wordpress.spec

 .gitignore     |    6 ++++++
 sources        |    2 +-
 wordpress.spec |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 51 insertions(+), 8 deletions(-)
---
diff --cc wordpress.spec
index dc6f087,3d82f07..68c57ea
--- a/wordpress.spec
+++ b/wordpress.spec
@@@ -1,9 -4,9 +4,9 @@@
  Summary: Blog tool and publishing platform
  URL: http://www.wordpress.org
  Name: wordpress
- Version: 3.2.1
+ Version: 3.3
  Group: Applications/Publishing
 -Release: 1%{?dist}
 +Release: 2%{?dist}
  License: GPLv2
  Source0: http://wordpress.org/%{name}-%{version}.tar.gz
  Source1: wordpress-httpd-conf
@@@ -103,9 -116,30 +116,33 @@@ rm -rf ${RPM_BUILD_ROOT
  %dir %{_sysconfdir}/wordpress
  
  %changelog
+ * Tue Dec 13 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-1
+ - New upstream release.
+ 
+ * Wed Dec 07 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.5.RC2
+ - ... and one day after I upgraded to RC1, we have new RC2 ;)
+ 
+ * Tue Dec 06 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.4.RC1
+ - Cool we are on RC1!
+ 
+ * Thu Nov 24 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.3.beta4
+ - Another upstream beta release (now hopefully, really close to RC)
+ 
+ * Fri Nov 11 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.3.beta3
+ - Fix version requirement for php (Closes #753192)
+ 
+ * Wed Nov 09 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.2.beta3
+ - Another upstream beta release.
+ 
+ * Thu Oct 20 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.1.beta2
+ - New upstream beta release (just for Rawhide, to be sure we build)
+ 
 +* Fri Nov 11 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.2.1-2
 +- Fix version requirement for php (Closes #753192)
 +
+ * Sat Jul 30 2011 Matěj Cepl <mcepl at redhat.com> - 3.2.1-2
+ - Rebuilt against new libraries.
+ 
  * Wed Jul 13 2011 Matěj Cepl <mcepl at redhat.com> - 3.2.1-1
  - New upstream release. Small fixes missed in 3.2.