From 5faa94e8f3ed4362d2248f5a357bd16ba6cb4bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Sun, 16 Sep 2012 17:12:56 +0200 Subject: [PATCH 1/2] New upstream release. Also: * use system PHPMailer * requires needed php extensions --- .gitignore | 30 +------------------------ sources | 2 +- wordpress.spec | 61 ++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 54 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index f4e7ed0..4f114c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1 @@ -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 -/wordpress-3.1.1.tar.gz -/wordpress-3.1.2.tar.gz -/wordpress-3.1.3.tar.gz -/wordpress-3.2-RC1.zip -/wordpress-3.2-RC3.zip -/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 -/wordpress-3.3.1.tar.gz -/wordpress-3.4-beta1.tar.gz -/wordpress-3.4-beta2.tar.gz -/wordpress-3.4-beta3.tar.gz -/wordpress-3.4-beta4.tar.gz -/wordpress-3.4-RC1.tar.gz -/wordpress-3.4-RC2.tar.gz -/wordpress-3.4-RC3.tar.gz -/wordpress-3.4.tar.gz -/wordpress-3.4.1.tar.gz -/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 414d616..c17dc8c 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: 2%{?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 @@ -19,7 +20,41 @@ 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 >= 5.2.4, webserver, php-mysql, php-gettext, php-simplepie +%if 0%{?rhel} == 5 +Requires: php53 >= 5.2.4, php53-simplepie +%else +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 BuildArch: noarch @@ -65,13 +100,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 @@ -117,6 +153,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. From 4c005057881d2be23fff27817c604ccfea735f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Wed, 12 Dec 2012 14:11:14 +0100 Subject: [PATCH 2/2] Add a comment explainin patch1 non-inclusion. --- wordpress.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wordpress.spec b/wordpress.spec index c17dc8c..5750940 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,6 +18,7 @@ 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