diff --git a/.gitignore b/.gitignore index d36dfea..3c8687f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ wordpress-2.8.6.tar.gz +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/README.fedora.wordpress-mu b/README.fedora.wordpress-mu new file mode 100644 index 0000000..af10453 --- /dev/null +++ b/README.fedora.wordpress-mu @@ -0,0 +1,5 @@ +As of wordpress 3.0.x, upstream has deprecated wordpress-mu. This +functionality has been included in mainline wordpress. For +information on migrating from wordpress-mu, visit +http://codex.wordpress.org/Migrating_Multiple_Blogs_into_WordPress_3.0_Multisite + diff --git a/sources b/sources index 4e01de6..5418752 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1956f09f2abe74ed85e0de04d511d433 wordpress-2.8.6.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 6d98d00..63a07cb 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,19 +1,18 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.8.6 +Version: 3.1 Group: Applications/Publishing -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress -Patch0: wordpress-2.8.6-r16625.patch -Patch1: wordpress-debian_patches_hello.patch -Patch2: wordpress-2.8.6-r17172.patch - +Source3: README.fedora.wordpress-mu +Patch0: wordpress-debian_patches_hello.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, webserver, php-mysql +Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie +Obsoletes: wordpress-mu BuildArch: noarch %description @@ -23,9 +22,7 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress -%patch0 -p0 -b .16625 -%patch1 -p1 -b .dolly -%patch2 -p1 -b .17172 +%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" \ @@ -46,11 +43,20 @@ cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php /bin/ln -sf ../../../etc/wordpress/wp-config.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-config.php /bin/cp %{SOURCE2} ./README.fedora +/bin/cp %{SOURCE3} ./README.fedora-multiuser # Remove empty files to make rpmlint happy 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} @@ -65,6 +71,7 @@ rm -rf ${RPM_BUILD_ROOT} %doc license.txt %doc readme.html %doc README.fedora +%doc README.fedora-multiuser %{_datadir}/wordpress/wp-atom.php %{_datadir}/wordpress/wp-app.php %{_datadir}/wordpress/wp-blog-header.php @@ -88,15 +95,38 @@ 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 Jan 03 2011 Jon Ciesla - 2.8.6-4 -- Patch for security vulnerability, BZ 666782. +* Wed Feb 23 2011 Jon Ciesla - 3.1-1 +- 3.1. -* Thu Dec 23 2010 Jon Ciesla - 2.8.6-3 +* Mon Feb 07 2011 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Jon Ciesla - 3.0.4-2 +- Obsoletes wordpress-mu, deprecated by upstream as of 3.0.x. + +* Mon Jan 03 2011 Jon Ciesla - 3.0.4-1 +- 3.0.4. Security fixes, BZ 666782. + +* Thu Dec 23 2010 Jon Ciesla - 3.0.3-2 - Change Requires from httpd to webserver, BZ 523480. - Patch for Hello Dolly lyrics, BZ 663966. -- Patch for security vulnerability, BZ 659319. + +* Fri Dec 10 2010 Jon Ciesla - 3.0.3-1 +- 3.0.3. Security fixes, BZ 659319. + +* Fri Dec 10 2010 Jon Ciesla - 3.0.2-1 +- 3.0.2. Security fixes, BZ 659319. + +* Mon Aug 09 2010 Jon Ciesla - 3.0.1-1 +- 3.0.1. + +* Mon Jul 12 2010 Jon Ciesla - 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 - 2.8.6-2 - updated to 2.8.6 (Security Release)