[wordpress] 3.0.1.

[Jon Ciesla]

commit 04f7e0dec9732c51e2c2f8a95d52bcf6b38b7cbc
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Wed Aug 11 11:31:14 2010 -0500

    3.0.1.

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |   23 ++++++++++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d36dfea..f211ebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 wordpress-2.8.6.tar.gz
+wordpress-3.0.1.tar.gz
diff --git a/sources b/sources
index 4e01de6..cb3dbb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1956f09f2abe74ed85e0de04d511d433  wordpress-2.8.6.tar.gz
+8fa5373ed805fb9a6ee56dfd236dcb64  wordpress-3.0.1.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index 31788b0..96117de 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,15 +1,15 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.6
+Version: 3.0.1
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: php >= 4.1.0, httpd, php-mysql
+Requires: php >= 4.1.0, httpd, php-mysql, php-gettext, php-simplepie
 BuildArch: noarch
 
 %description
@@ -42,6 +42,14 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -f {} \;
 # 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
+ln -sf /usr/share/php/php-gettext/gettext.php ${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
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -79,8 +87,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/wordpress/wp-trackback.php
 %{_datadir}/wordpress/xmlrpc.php
 %dir %{_sysconfdir}/wordpress
+%{_datadir}/wordpress/wp-activate.php
+%{_datadir}/wordpress/wp-signup.php
 
 %changelog
+* Mon Aug 09 2010 Jon Ciesla <limb at jcomserv.net> - 3.0.1-1
+- 3.0.1.
+
+* Mon Jul 12 2010 Jon Ciesla <limb at jcomserv.net> - 2.8.6-3
+- Remove bundled php-gettext and php-simplepie,
+- require and link to system versions, BZ 544720.
+
 * Mon Nov 16 2009 Adrian Reber <adrian at lisas.de> - 2.8.6-2
 - updated to 2.8.6 (Security Release)