From 62c84be80eeffc992a637ce2364eabf311edac3d Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Fri, 9 Nov 2007 15:03:18 +0000
Subject: [PATCH] - updated to 2.3.1 (bz 357731, wordpress XSS issue)

---
 .cvsignore     |  3 +--
 sources        |  3 +--
 wordpress.spec | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ba1cbea..f06ed21 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-wordpress-2.2.2.tar.gz
-wordpress-2.2.3.tar.gz
+wordpress-2.3.1.tar.gz
diff --git a/sources b/sources
index 667782e..c4103cb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-a87666c6fe6cb4db94e2ae0531e5b633  wordpress-2.2.2.tar.gz
-98c1e611f8533d4fe4e8f995b8d83110  wordpress-2.2.3.tar.gz
+bd53264cbe80e470c5a9bc2cf7aa85e4  wordpress-2.3.1.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index eff3ddf..549c614 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,13 +1,10 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.2.3
+Version: 2.3.1
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPLv2
-# Source0 with name-version does not work for web retrieval, 
-# latest.tar.gz does not work for build
-# Source0: http://wordpress.org/latest.tar.gz
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
@@ -21,6 +18,8 @@ almost trivial, to get information out to people on the web.
 
 %prep
 %setup -q -n wordpress
+# disable-wordpress-core-update, updates are always installed via rpm
+sed -i -e "s,add_action,#add_action,g" wp-includes/update.php
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress
@@ -74,6 +73,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Oct 30 2007 Adrian Reber <adrian@lisas.de> - 2.3.1-1
+- updated to 2.3.1 (bz 357731, wordpress XSS issue)
+
+* Mon Oct 15 2007 Adrian Reber <adrian@lisas.de> - 2.3-1
+- updated to 2.3
+- disabled wordpress-core-update
+
 * Tue Sep 11 2007 Adrian Reber <adrian@lisas.de> - 2.2.3-0
 - updated to 2.2.3 (security release)
 
@@ -117,7 +123,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 * Tue Jun 20 2006 John Berninger <jwb at redhat dot com> - 2.0.3-2
 - Remove use of installprefix macro
-- %{_datadir}/wordpress/wp-config.php is not a config file
+- %%{_datadir}/wordpress/wp-config.php is not a config file
 - Symlink is relative
 
 * Mon Jun 19 2006 John Berninger <jwb at redhat dot com> - 2.0.3-1