- fix use of system Simplepie

- give access from local (httpd 2.4)
This commit is contained in:
Remi Collet 2012-12-16 20:02:23 +01:00
commit b25e97572f
2 changed files with 22 additions and 4 deletions

View file

@ -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>

View file

@ -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.