rpms/wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into f17

Browse source 
Conflicts:
	.gitignore
	wordpress.spec
This commit is contained in:
Nick Bebout 2013-01-11 17:34:25 -06:00
commit cffcd49dc0
3 changed files with 85 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
.gitignore vendored
View file

@ -1 +1,36 @@
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

11
wordpress-httpd-conf
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>

46
wordpress.spec
View file

@ -7,7 +7,7 @@ Name: wordpress
Version: 3.5
Group: Applications/Publishing
#Release: 0.5.%{betatag}%{?dist}
Release: 1%{?dist}
Release: 3%{?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,17 @@ 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
for fic in phpmailer smtp pop3; do
rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
ln -sf /usr/share/php/PHPMailer/class.$fic.php \
${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
done
# Remove bundled PHPMailer and link to system one
rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-{phpmailer,smtp,pop3}.php
@ -154,12 +164,34 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_sysconfdir}/wordpress
%changelog
* Mon Jan 2 2013 Remi Collet <rcollet@redhat.com> - 3.5-3
- fix links to system PHPMailer library
* 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.
* Mon Oct 29 2012 Remi Collet <rcollet@redhat.com> - 3.5-0.3.beta2
- use system PHPMailer
- requires needed php extensions
* Tue Dec 04 2012 Matěj Cepl <mcepl@redhat.com> - 3.5-0.5.RC3
- New upstream release candidate.
* Fri Nov 30 2012 Matěj Cepl <mcepl@redhat.com> - 3.5-0.5.RC2
- New upstream release candidate.
* Sat Nov 24 2012 Matěj Cepl <mcepl@redhat.com> - 3.5-0.5.RC1
- New upstream release candidate.
* Tue Nov 13 2012 Matěj Cepl <mcepl@redhat.com> - 3.5-0.4.beta3
- New upstream beta3 version
* Sat Oct 13 2012 Matěj Cepl <mcepl@redhat.com> - 3.5-0.2.beta2
- New upstream beta2 version
* Thu Oct 04 2012 Matěj Cepl <mcepl@redhat.com> - 3.5-0.2.beta1
- New upstream beta1 version
- Don’t even bother with removing gettext.php ... it is not used anymore
* Thu Sep 06 2012 Matej Cepl <mcepl@redhat.com> - 3.4.2-2
- Upstream security update.