diff --git a/.gitignore b/.gitignore
index 87a2493..3c8687f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ wordpress-3.0.1.tar.gz
/wordpress-3.0.2.tar.gz
/wordpress-3.0.3.tar.gz
/wordpress-3.0.4.tar.gz
+/wordpress-3.1.tar.gz
diff --git a/sources b/sources
index 7eb8c0c..5418752 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a455e0834eb2c8994c35acf3c13ddc11 wordpress-3.0.4.tar.gz
+b8a701bbcb3fdd5829fec5d90f223b56 wordpress-3.1.tar.gz
diff --git a/wordpress-debian_patches_hello.patch b/wordpress-debian_patches_hello.patch
index 7e52551..c174426 100644
--- a/wordpress-debian_patches_hello.patch
+++ b/wordpress-debian_patches_hello.patch
@@ -1,14 +1,13 @@
-Use GPL-compliant lyrics in the hello dolly plugin
---- a/wp-content/plugins/hello.php
-+++ b/wp-content/plugins/hello.php
+--- wordpress/wp-content/plugins/hello.php~ 2010-11-10 06:43:04.000000000 -0600
++++ wordpress/wp-content/plugins/hello.php 2011-02-23 10:10:52.152777012 -0600
@@ -6,42 +6,26 @@
/*
Plugin Name: Hello Dolly
- Plugin URI: http://wordpress.org/#
+ Plugin URI: http://wordpress.org/extend/plugins/hello-dolly/
-Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page.
+Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the Free Software Song in the upper right of your admin screen on every page.
Author: Matt Mullenweg
- Version: 1.5.1
+ Version: 1.6
Author URI: http://ma.tt/
*/
@@ -57,4 +56,4 @@ Use GPL-compliant lyrics in the hello dolly plugin
+You'll be free, hackers, you'll be free.";
// Here we split it into lines
- $lyrics = explode("\n", $lyrics);
+ $lyrics = explode( "\n", $lyrics );
diff --git a/wordpress.spec b/wordpress.spec
index 60ef6ec..63a07cb 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,9 +1,9 @@
Summary: WordPress blogging software
URL: http://www.wordpress.org
Name: wordpress
-Version: 3.0.4
+Version: 3.1
Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 1%{?dist}
License: GPLv2
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
Source1: wordpress-httpd-conf
@@ -99,6 +99,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/wordpress/wp-signup.php
%changelog
+* Wed Feb 23 2011 Jon Ciesla - 3.1-1
+- 3.1.
+
* Mon Feb 07 2011 Fedora Release Engineering - 3.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild