From 144100a8c59175044bb74ae9932fe9f41d57d2b3 Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Dec 12 2011 23:56:51 +0000 Subject: Merge branch 'master' into f14 --- diff --git a/.gitignore b/.gitignore index cfbcde5..765f5a4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,9 @@ wordpress-3.0.1.tar.gz /wordpress-3.1.4.tar.gz /wordpress-3.2.tar.gz /wordpress-3.2.1.tar.gz +/wordpress-3.3-beta2.tar.gz +/wordpress-3.3-beta3.tar.gz +/wordpress-3.3-beta4.tar.gz +/wordpress-3.3-RC1.tar.gz +/wordpress-3.3-RC2.tar.gz +/wordpress-3.3.tar.gz diff --git a/sources b/sources index 5b9fe7c..83260c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7dc263818637962b82deec04b86dbac6 wordpress-3.2.1.tar.gz +0bb9a6c3bfb96659a2312722f913e8c3 wordpress-3.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index f9d5228..38c7271 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,10 @@ +%global wp_content %{_datadir}/wordpress/wp-content +%global betatag RC2 + Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.2.1 +Version: 3.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -15,7 +18,7 @@ Patch0: wordpress-debian_patches_hello.patch # Move wp-content to /var/www/wordpress/ Patch1: wordpress-move-wp-content.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie +Requires: php >= 5.2.4, webserver, php-mysql, php-gettext, php-simplepie Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 BuildArch: noarch @@ -52,6 +55,10 @@ cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress /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 + +# Create additional wp-content directories so we can own them +install -d ${RPM_BUILD_ROOT}%{wp_content}/{plugins,themes,upgrade,uploads} + # Remove empty files to make rpmlint happy find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; # These are docs, remove them from here, docify them later @@ -65,20 +72,19 @@ 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 # Remove backup copies of patches -find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) -print -delete +find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \ + -print -delete ## Move wp-content directory to /var/www location #mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress -#mv -v ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-content/ \ +#mv -v ${RPM_BUILD_ROOT}%{wp_content}/ \ # ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress - #%post #if [ $1 -eq 2 ] ; then ## In case user has old wp-content from previous version, move it to ## the new location. -#mv -uf %{_datadir}/wordpress/wp-content/* \ -# %{_localstatedir}/www/wordpress/ +#mv -uf %{wp_content}/* %{_localstatedir}/www/wordpress/ #/sbin/restorecon -R %{_localstatedir}/www/wordpress/ #fi @@ -91,8 +97,15 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_datadir}/wordpress %{_datadir}/wordpress/wp-admin %{_datadir}/wordpress/wp-includes -%{_datadir}/wordpress/wp-content %{_datadir}/wordpress/index.php +%dir %{wp_content}/ +%{wp_content}/index.php +%dir %attr(0775,apache,ftp) %{wp_content}/plugins +%dir %attr(0775,apache,ftp) %{wp_content}/themes +%dir %attr(0775,apache,ftp) %{wp_content}/upgrade +%dir %attr(0775,apache,ftp) %{wp_content}/uploads +%{wp_content}/plugins/* +%{wp_content}/themes/* %doc license.txt %doc readme.html %doc README.fedora @@ -103,6 +116,30 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Dec 13 2011 'Matěj Cepl ' - 3.3-1 +- New upstream release. + +* Wed Dec 07 2011 'Matěj Cepl ' - 3.3-0.5.RC2 +- ... and one day after I upgraded to RC1, we have new RC2 ;) + +* Tue Dec 06 2011 'Matěj Cepl ' - 3.3-0.4.RC1 +- Cool we are on RC1! + +* Thu Nov 24 2011 'Matěj Cepl ' - 3.3-0.3.beta4 +- Another upstream beta release (now hopefully, really close to RC) + +* Fri Nov 11 2011 'Matěj Cepl ' - 3.3-0.3.beta3 +- Fix version requirement for php (Closes #753192) + +* Wed Nov 09 2011 'Matěj Cepl ' - 3.3-0.2.beta3 +- Another upstream beta release. + +* Thu Oct 20 2011 'Matěj Cepl ' - 3.3-0.1.beta2 +- New upstream beta release (just for Rawhide, to be sure we build) + +* Sat Jul 30 2011 Matěj Cepl - 3.2.1-2 +- Rebuilt against new libraries. + * Wed Jul 13 2011 Matěj Cepl - 3.2.1-1 - New upstream release. Small fixes missed in 3.2.