[wordpress: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/wordpress

[Matej Cepl]

commit b924a75ade7d3137c81569d422247de94a6050eb
Merge: b2077de 3ee3520
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Nov 13 20:47:19 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/wordpress
    
    Conflicts:
    	wordpress.spec

 wordpress.spec |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)
---
diff --cc wordpress.spec
index 4ff5023,98d72fc..f6a87c1
--- a/wordpress.spec
+++ b/wordpress.spec
@@@ -6,7 -6,7 +6,7 @@@ URL: http://www.wordpress.or
  Name: wordpress
  Version: 3.5
  Group: Applications/Publishing
- Release: 0.2.%{betatag}%{?dist}
 -Release: 0.3.%{betatag}%{?dist}
++Release: 0.4.%{betatag}%{?dist}
  #Release: 3%{?dist}
  License: GPLv2
  Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
@@@ -119,9 -152,10 +152,13 @@@ rm -rf ${RPM_BUILD_ROOT
  %dir %{_sysconfdir}/wordpress
  
  %changelog
- * Tue Nov 13 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.2.beta3
++* Tue Nov 13 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.4.beta3
 +- New upstream beta3 version
 +
+ * Mon Oct 29 2012 Remi Collet <rcollet at redhat.com> - 3.5-0.3.beta2
+ - use system PHPMailer
+ - requires needed php extensions
+ 
  * Sat Oct 13 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-0.2.beta2
  - New upstream beta2 version