Two fixes.

wordpress-debian_patches_hello.patch

@@ -0,0 +1,60 @@
+Use GPL-compliant lyrics in the hello dolly plugin
+--- a/wp-content/plugins/hello.php
++++ b/wp-content/plugins/hello.php
+@@ -6,42 +6,26 @@
+ /*
+ Plugin Name: Hello Dolly
+ Plugin URI: http://wordpress.org/#
+-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 <cite>Hello, Dolly</cite> 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 <cite>Free Software Song</cite> in the upper right of your admin screen on every page.
+ Author: Matt Mullenweg
+ Version: 1.5.1
+ Author URI: http://ma.tt/
+ */
+ 
+ function hello_dolly_get_lyric() {
+-	/** These are the lyrics to Hello Dolly */
+-	$lyrics = "Hello, Dolly
+-Well, hello, Dolly
+-It's so nice to have you back where you belong
+-You're lookin' swell, Dolly
+-I can tell, Dolly
+-You're still glowin', you're still crowin'
+-You're still goin' strong
+-We feel the room swayin'
+-While the band's playin'
+-One of your old favourite songs from way back when
+-So, take her wrap, fellas
+-Find her an empty lap, fellas
+-Dolly'll never go away again
+-Hello, Dolly
+-Well, hello, Dolly
+-It's so nice to have you back where you belong
+-You're lookin' swell, Dolly
+-I can tell, Dolly
+-You're still glowin', you're still crowin'
+-You're still goin' strong
+-We feel the room swayin'
+-While the band's playin'
+-One of your old favourite songs from way back when
+-Golly, gee, fellas
+-Find her a vacant knee, fellas
+-Dolly'll never go away
+-Dolly'll never go away
+-Dolly'll never go away again";
++	// These are the lyrics to the Free Software Song
++$lyrics = "Join us now and share the software;
++You'll be free, hackers, you'll be free.
++Hoarders may get piles of money,
++That is true, hackers, that is true.
++But they cannot help their neighbors;
++That ain't good, hackers, that ain't good.
++When we have enough free software
++At our call, hackers, at our call,
++We'll kick out those dirty licenses
++Ever more, hackers, ever more.
++Join us now and share the software;
++You'll be free, hackers, you'll be free.";
+ 
+ 	// Here we split it into lines
+ 	$lyrics = explode("\n", $lyrics);

wordpress.spec

@@ -3,13 +3,14 @@ URL: http://www.wordpress.org
 Name: wordpress
 Version: 3.0.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
+Patch0: wordpress-debian_patches_hello.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: php >= 4.1.0, httpd, php-mysql, php-gettext, php-simplepie
+Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie
 BuildArch: noarch
 
 %description
@@ -18,6 +19,9 @@ almost trivial, to get information out to people on the web.
 
 %prep
 %setup -q -n wordpress
+
+%patch0 -p1 -b .dolly
+
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
@@ -91,6 +95,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/wordpress/wp-signup.php
 
 %changelog
+* Thu Dec 23 2010 Jon Ciesla <limb@jcomserv.net> - 3.0.3-2
+- Change Requires from httpd to webserver, BZ 523480.
+- Patch for Hello Dolly lyrics, BZ 663966.
+
 * Fri Dec 10 2010 Jon Ciesla <limb@jcomserv.net> - 3.0.3-1
 - 3.0.3. Security fixes, BZ 659319.