[wordpress] Upstream 3.5beta1

[Matej Cepl]

commit 7b08410286c29cb46bd713fcd53905a426eac7d6
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Oct 4 17:39:28 2012 +0200

    Upstream 3.5beta1
    
    Also don't bother with removing gettext.php (fix #863027)

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |   17 +++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4e7ed0..6536cb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.4.tar.gz
 /wordpress-3.4.1.tar.gz
 /wordpress-3.4.2.tar.gz
+/wordpress-3.5-beta-1.tar.gz
diff --git a/sources b/sources
index 4697198..580500b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfc56cee27eec8fb79070f033ecd4b25  wordpress-3.4.2.tar.gz
+153eed2ea13104091329306cd120499d  wordpress-3.5-beta-1.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index ea4d330..8eaf737 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,15 +1,15 @@
 %global wp_content %{_datadir}/wordpress/wp-content
-#%#global betatag -RC3
+%global betatag beta1
 
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.4.2
+Version: 3.5
 Group: Applications/Publishing
-#Release: 0.2.%{betatag}%{?dist}
-Release: 3%{?dist}
+Release: 0.2.%{betatag}%{?dist}
+#Release: 3%{?dist}
 License: GPLv2
-Source0: http://wordpress.org/%{name}-%{version}%{?betatag}.tar.gz
+Source0: http://wordpress.org/%{name}-%{version}-beta-1.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
 Source3: README.fedora.wordpress-mu
@@ -70,9 +70,6 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \;
 # These are docs, remove them from here, docify them later
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html}
 
-# Remove bundled php-gettext and link to system copy
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/gettext.php
-
 # Remove bundled php-simplepie and link to system copy
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
 ln -sf /usr/share/php/php-simplepie/simplepie.inc ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
@@ -122,6 +119,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 04 2012 Matěj Cepl <mcepl at redhat.com> - 3.5.1-0.2.beta1
+- New upstream beta1 version
+- Don’t even bother with removing gettext.php ... it is not used anymore
+
 * Thu Sep 06 2012 Matej Cepl <mcepl at redhat.com> - 3.4.2-2
 - Upstream security update.