commit effc25273226e891448d8b596e7c7b1db9de6018
Author: Matěj Cepl <mcepl at redhat.com>
Date: Thu May 26 00:27:10 2011 +0200
New upstream version and some small fixes.
.gitignore | 1 +
sources | 2 +-
wordpress-FSF-address.patch | 12 +++++++
wordpress-move-wp-content.patch | 12 +++++++
wordpress.spec | 66 +++++++++++++++++++++++----------------
5 files changed, 65 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e3a453f..b266141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ wordpress-3.0.1.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
diff --git a/sources b/sources
index 34864b4..ad6311b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2dee4df1cf5e1539ffba2da49a6cfa7 wordpress-3.1.2.tar.gz
+dd0323f13f5b1c44636bb3db5ca1c717 wordpress-3.1.3.tar.gz
diff --git a/wordpress-FSF-address.patch b/wordpress-FSF-address.patch
new file mode 100644
index 0000000..8992779
--- /dev/null
+++ b/wordpress-FSF-address.patch
@@ -0,0 +1,12 @@
+diff -up wordpress/wp-includes/kses.php.FSFaddr wordpress/wp-includes/kses.php
+--- wordpress/wp-includes/kses.php.FSFaddr 2011-05-25 23:54:34.347025847 +0200
++++ wordpress/wp-includes/kses.php 2011-05-25 23:56:18.403727954 +0200
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit
++ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * [kses strips evil scripts!]
diff --git a/wordpress-move-wp-content.patch b/wordpress-move-wp-content.patch
new file mode 100644
index 0000000..7dd738e
--- /dev/null
+++ b/wordpress-move-wp-content.patch
@@ -0,0 +1,12 @@
+diff -up wordpress/wp-includes/default-constants.php.rhbz522897 wordpress/wp-includes/default-constants.php
+--- wordpress/wp-includes/default-constants.php.rhbz522897 2011-05-25 22:02:51.857213589 +0200
++++ wordpress/wp-includes/default-constants.php 2011-05-25 22:19:01.211438543 +0200
+@@ -39,7 +39,7 @@ function wp_initial_constants( ) {
+ @ini_set('memory_limit', WP_MEMORY_LIMIT);
+
+ if ( !defined('WP_CONTENT_DIR') )
+- define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
++ define( 'WP_CONTENT_DIR', '/var/www/wordpress/wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
+
+ // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
+ if ( !defined('WP_DEBUG') )
diff --git a/wordpress.spec b/wordpress.spec
index 706aab1..a15acab 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,7 +1,7 @@
Summary: WordPress blogging software
URL: http://www.wordpress.org
Name: wordpress
-Version: 3.1.2
+Version: 3.1.3
Group: Applications/Publishing
Release: 1%{?dist}
License: GPLv2
@@ -9,7 +9,14 @@ 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
+# Move wp-content to /var/www/wordpress/
+Patch1: wordpress-move-wp-content.patch
+# Fix FSF address (again) ... patch posted upstream
+# http://core.trac.wordpress.org/ticket/14967
+Patch2: wordpress-FSF-address.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
@@ -23,6 +30,8 @@ almost trivial, to get information out to people on the web.
%setup -q -n wordpress
%patch0 -p1 -b .dolly
+%patch1 -p1 -b .rhbz522897
+%patch2 -p1 -b .FSFaddr
# disable wp_version_check, updates are always installed via rpm
sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
@@ -45,18 +54,36 @@ cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress
/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 {} \;
+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
+# Remove bundled php-gettext and link to system copy
rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/gettext.php
ln -sf /usr/share/php/php-gettext/gettext.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/gettext.php
-#Remove bundled php-simplepie and link to system copy
+# 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 backup copies of patches
+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/ \
+ ${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 -v %{_datadir}/wordpress/wp-content/* \
+ %{_localstatedir}/www/wordpress/wp-content/
+/sbin/restorecon -R %{_localstatedir}/www/wordpress/
+fi
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -65,40 +92,25 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress.conf
%dir %{_datadir}/wordpress
%{_datadir}/wordpress/wp-admin
-%{_datadir}/wordpress/wp-content
+%{_localstatedir}/www/wordpress/
%{_datadir}/wordpress/wp-includes
%{_datadir}/wordpress/index.php
%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
-%{_datadir}/wordpress/wp-comments-post.php
-%{_datadir}/wordpress/wp-commentsrss2.php
-%{_datadir}/wordpress/wp-config-sample.php
-%{_datadir}/wordpress/wp-config.php
+%{_datadir}/wordpress/wp-*.php
%config(noreplace) %{_sysconfdir}/wordpress/wp-config.php
-%{_datadir}/wordpress/wp-cron.php
-%{_datadir}/wordpress/wp-feed.php
-%{_datadir}/wordpress/wp-links-opml.php
-%{_datadir}/wordpress/wp-load.php
-%{_datadir}/wordpress/wp-login.php
-%{_datadir}/wordpress/wp-mail.php
-%{_datadir}/wordpress/wp-pass.php
-%{_datadir}/wordpress/wp-rdf.php
-%{_datadir}/wordpress/wp-register.php
-%{_datadir}/wordpress/wp-rss.php
-%{_datadir}/wordpress/wp-rss2.php
-%{_datadir}/wordpress/wp-settings.php
-%{_datadir}/wordpress/wp-trackback.php
%{_datadir}/wordpress/xmlrpc.php
%dir %{_sysconfdir}/wordpress
-%{_datadir}/wordpress/wp-activate.php
-%{_datadir}/wordpress/wp-signup.php
%changelog
+* Wed May 25 2011 Matěj Cepl <mcepl at redhat.com> - 3.1.3-1
+- Upgrade to the latest upstream version (security fixes and enhancements, BZ 707772)
+- Move wp-content directory to /var/www/wordpress/ (BZ 522897)
+- Simplify overly detailed %%files
+- Fix old FSF address to make rpmlint happy.
+
* Sun May 01 2011 Matěj Cepl <mcepl at redhat.com> - 3.1.2-1
- New upstream release.