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/wordpress.spec b/wordpress.spec index cb4ad06..ef8864a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,14 +3,16 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.0.4 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 +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, php-gettext, php-simplepie +Obsoletes: wordpress-mu BuildArch: noarch %description @@ -41,6 +43,7 @@ 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 @@ -68,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 @@ -95,6 +99,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* 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.