[wordpress/el6] - update to 3.7 - requires ca-certificates for ca-bundle.crt
Remi Collet
remi at fedoraproject.org
Fri Oct 25 12:56:20 UTC 2013
commit 7386124d97ef8d9cbbdf4212c9264f700e6c8ada
Author: Remi Collet <remi at fedoraproject.org>
Date: Fri Oct 25 14:56:21 2013 +0200
- update to 3.7
- requires ca-certificates for ca-bundle.crt
.gitignore | 40 +----------------------------------
README.fedora.wordpress | 47 +++++++++++++++++------------------------
sources | 2 +-
wordpress.spec | 53 +++++++++++++++++++++++++++++++---------------
4 files changed, 58 insertions(+), 84 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff39350..eaa76bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +1,3 @@
*spec~
clog
-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-beta-1.tar.gz
-/wordpress-3.5-beta2.tar.gz
-/wordpress-3.5-beta3.tar.gz
-/wordpress-3.5-RC1.tar.gz
-/wordpress-3.5-RC2.tar.gz
-/wordpress-3.5-RC3.tar.gz
-/wordpress-3.5.tar.gz
-/wordpress-3.5.1.tar.gz
-/wordpress-3.5.2.tar.gz
-/wordpress-3.6.tar.gz
+/wordpress-3.7.tar.gz
diff --git a/README.fedora.wordpress b/README.fedora.wordpress
index 469b6e0..20f8739 100644
--- a/README.fedora.wordpress
+++ b/README.fedora.wordpress
@@ -1,9 +1,6 @@
Wordpress is a database driven blogging program designed to make it exceedingly
easy to publish an online blog, sometimes also called a weblog or journal.
-
-CONFIGURING WORDPRESS FOR THE FIRST TIME
-----------------------------------------
Once this package is installed, there are a few configuration items which need
to be performed before the blog is usable. First, you need to establish a
username and password to connect to your MySQL database as, and make both
@@ -47,27 +44,23 @@ open a web browser to http://localhost/wordpress/wp-admin/install.php and
follow the instructions given to you on the pages you see to set up the
database tables and begin publishing your blog.
-
-UPGRADING WORDPRESS
--------------------
-In order to upgrade from a 2.1 series package, there are several steps you
-will need to take. If you've already performed the 'yum update', all is not
-lost, and you more than likely still be able to complete the upgrade
-painlessly.
-
-First, you will want to back up your entire database. This is simply common
-sense, but it is also mentioned explicitly in Wordpress's upgrade instructions.
-
-You should have disabled all your plugins. Having old plugins still active
-could cause problems, as the old plugins may not be compatible with the new
-version of Wordpress.
-
-Once all the plugins are disabled, run the actual yum update. Once this
-completes, you should point a browser at
-http://<your wordpress host>/wordpress/wp-admin/upgrade.php and follow the
-instructions that appear in the browser window. Once this is completed, you
-can begin reactivating plugins one at a time.
-
-If you need a more detailed upgrade document, or you run into problems, please
-see the Wordpress upgrade documentation at
-http://codex.wordpress.org/Upgrading_WordPress#Detailed_Instructions
+Wordpress ships with Flash and Silverlight plugins for the 'plupload' file
+uploader and the 'mediaelement' media player embedder. The idea is to try and
+be able to provide a multi-file uploader and an embedded video player when
+HTML5 is not available (or does not support the video format in question).
+These plugins are provided as pre-built binaries and there is no mechanism
+for building them from source during Wordpress compilation. As the inclusion
+of pre-built binaries is against Fedora policy - see
+https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries
+ - these plugins have been removed from the Fedora package. As a consequence:
+
+a) any Wordpress element or plugin that uses the 'plupload' will only present
+an HTML5-based multi-file uploader if HTML5 is supported by the user's browser
+or an HMTL4-based single-file uploader in HTML5 is not supported. No Flash
+or Silverlight-based multi-file uploader will be provided.
+
+b) If you try to embed media into a Wordpress post using the [video] and
+[audio] short tags, the media player will be visible if the reader is using
+a browser that has HTML5 support for the media format in question; if not, the
+'Download Media' link will be offered. No Flash or Silverlight-based player
+element will be included.
diff --git a/sources b/sources
index ab49b3f..a1a980b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f2c0b6f7f0626b5170a7b5df99d78b8 wordpress-3.6.1.tar.gz
+aaad36cd739b825952cf3e09de5e7856 wordpress-3.7.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index 13bf4d1..94e01f1 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,19 +1,24 @@
%global wp_content %{_datadir}/wordpress/wp-content
-%global betatag RC3
-
-Summary: Blog tool and publishing platform
-URL: http://www.wordpress.org
-Name: wordpress
-Version: 3.6.1
-Group: Applications/Publishing
-#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}.tar.gz
-Source1: wordpress-httpd-conf
-Source2: README.fedora.wordpress
-Source3: README.fedora.wordpress-mu
+
+%if 0%{?rhel} == 5
+%global with_cacert 0
+%else
+%global with_cacert 1
+%endif
+
+Summary: Blog tool and publishing platform
+URL: http://www.wordpress.org
+Name: wordpress
+Version: 3.7
+Group: Applications/Publishing
+Release: 1%{?dist}
+License: GPLv2
+
+Source0: http://wordpress.org/%{name}-%{version}.tar.gz
+Source1: wordpress-httpd-conf
+Source2: README.fedora.wordpress
+Source3: README.fedora.wordpress-mu
+
# Patch out copyrighted text of Hello, Dolly
# (and replace it with Free Software Song)
Patch0: wordpress-debian_patches_hello.patch
@@ -41,7 +46,7 @@ Requires: php53-simplepie >= 1.3.1
Requires: php >= 5.2.4
Requires: php-simplepie >= 1.3.1
%endif
-# Required php extension (detected by phpci)
+# Required php extension (detected by phpcompatinfo)
Requires: php-curl
Requires: php-date
Requires: php-dom
@@ -71,6 +76,9 @@ Requires: php-zlib
# Unbundled libraries
Requires: php-PHPMailer
Requires: webserver
+%if %{with_cacert}
+Requires: ca-certificates
+%endif
Provides: wordpress-mu = %{version}-%{release}
Obsoletes: wordpress-mu < 2.9.3
@@ -160,8 +168,15 @@ for fic in phpmailer smtp; do
${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
done
+# Remove bundled ca-bundle.crt
+%if %{with_cacert}
+rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
+ln -s /etc/pki/tls/certs/ca-bundle.crt \
+ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
+%endif
+
# Remove backup copies of patches
-find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \
+find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig \) \
-print -delete
## Move wp-content directory to /var/www location
@@ -205,6 +220,10 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_sysconfdir}/wordpress
%changelog
+* Fri Oct 25 2013 Remi Collet <rcollet at redhat.com> - 3.7-1
+- update to 3.7
+- requires ca-certificates for ca-bundle.crt
+
* Thu Sep 12 2013 Paul Wouters <pwouters at redhat.com> - 3.6.1-1
- update to 3.6.1, various bugs and security fixes:
CVE-2013-4338 CVE-2013-4339 CVE-2013-4340
More information about the scm-commits
mailing list