From b25e97572fc45e88ba1f62618e5bbb68f84230aa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sun, 16 Dec 2012 20:02:23 +0100
Subject: [PATCH] - fix use of system Simplepie - give access from local (httpd
 2.4)

---
 wordpress-httpd-conf | 11 +++++++++++
 wordpress.spec       | 15 +++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/wordpress-httpd-conf b/wordpress-httpd-conf
index 5552c00..76c708b 100644
--- a/wordpress-httpd-conf
+++ b/wordpress-httpd-conf
@@ -2,4 +2,15 @@ Alias /wordpress /usr/share/wordpress
 
 <Directory /usr/share/wordpress>
   AllowOverride Options
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require local
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order Deny,Allow
+    Deny from All
+    Allow from 127.0.0.1
+    Allow from ::1
+ </IfModule>
 </Directory>
diff --git a/wordpress.spec b/wordpress.spec
index 8ee628e..68fdfee 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -7,7 +7,7 @@ Name: wordpress
 Version: 3.5
 Group: Applications/Publishing
 #Release: 0.5.%{betatag}%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
@@ -24,7 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?rhel} == 5
 Requires: php53 >= 5.2.4, php53-simplepie
 %else
-Requires: php >= 5.2.4, php-simplepie
+Requires: php >= 5.2.4
+Requires: php-simplepie >= 1.3.1
 %endif
 # Required php extension (detected by phpci)
 Requires: php-curl
@@ -102,8 +103,10 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \;
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html}
 
 # 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
+rm -f  ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie
+ln -sf /usr/share/php/php-simplepie/autoloader.php \
+       ${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
@@ -154,6 +157,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Sun Dec 16 2012 Remi Collet <rcollet@redhat.com> - 3.5-2
+- fix use of system Simplepie
+- give access from local (httpd 2.4)
+
 * Wed Dec 12 2012 Matěj Cepl <mcepl@redhat.com> - 3.5-1
 - New upstream release.