diff --git a/.gitignore b/.gitignore index e4c188a..4f114c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wordpress-3.4.2.tar.gz +/wordpress-3.5.tar.gz diff --git a/sources b/sources index 4697198..3744939 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfc56cee27eec8fb79070f033ecd4b25 wordpress-3.4.2.tar.gz +105b5baff67344528bb5d8b71c050b0d wordpress-3.5.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 04bf393..746bad8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,15 +1,16 @@ %global wp_content %{_datadir}/wordpress/wp-content -#%#global betatag -RC3 +%global betatag RC3 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.4.2 +Version: 3.5 Group: Applications/Publishing -#Release: 0.2.%{betatag}%{?dist} -Release: 3%{?dist} +#Release: 0.5.%{betatag}%{?dist} +Release: 1%{?dist} License: GPLv2 -Source0: http://wordpress.org/%{name}-%{version}%{?betatag}.tar.gz +#Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz +Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu @@ -17,13 +18,43 @@ Source3: README.fedora.wordpress-mu # (and replace it with Free Software Song) Patch0: wordpress-debian_patches_hello.patch # Move wp-content to /var/www/wordpress/ +# This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?rhel} == 5 -Requires: php53 >= 5.2.4, php53-mysql, php53-simplepie +Requires: php53 >= 5.2.4, php53-simplepie %else -Requires: php >= 5.2.4, php-mysql, php-simplepie +Requires: php >= 5.2.4, php-simplepie %endif +# Required php extension (detected by phpci) +Requires: php-curl +Requires: php-date +Requires: php-dom +Requires: php-enchant +# not yet available for RHEL Requires: php-ereg +Requires: php-exif +Requires: php-fileinfo +# not yet available for RHEL Requires: php-filter +Requires: php-gettext +Requires: php-hash +Requires: php-iconv +Requires: php-json +Requires: php-libxml +Requires: php-mbstring +Requires: php-mysql +Requires: php-openssl +Requires: php-pcre +Requires: php-pdo +Requires: php-posix +Requires: php-reflection +Requires: php-simplexml +Requires: php-sockets +Requires: php-spl +Requires: php-tokenizer +Requires: php-zip +Requires: php-zlib +# Unbundled libraries +Requires: php-PHPMailer Requires: webserver Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -70,13 +101,14 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; # 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 - # 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 +# Remove bundled PHPMailer and link to system one +rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-{phpmailer,smtp,pop3}.php +ln -sf /usr/share/php/PHPMailer/*php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ + # Remove backup copies of patches find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \ -print -delete @@ -122,6 +154,13 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Dec 12 2012 Matěj Cepl - 3.5-1 +- New upstream release. + +* Mon Oct 29 2012 Remi Collet - 3.5-0.3.beta2 +- use system PHPMailer +- requires needed php extensions + * Thu Sep 06 2012 Matej Cepl - 3.4.2-2 - Upstream security update.