[wordpress] fix simplepie links (make spec compatible for all branch, including epel-5)

Remi Collet remi at fedoraproject.org
Wed Jan 30 16:34:38 UTC 2013


commit 0d51a78b0f77d5cb2f5ba7879b8fe5277e16c70b
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 17:34:30 2013 +0100

    fix simplepie links (make spec compatible for all branch, including epel-5)

 wordpress.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/wordpress.spec b/wordpress.spec
index 96de685..a7d2ac5 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -7,7 +7,7 @@ Name: wordpress
 Version: 3.5.1
 Group: Applications/Publishing
 #Release: 0.5.%{betatag}%{?dist}
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 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)
 BuildArch: noarch
 
 %if 0%{?rhel} == 5
-Requires: php53 >= 5.2.4, php53-simplepie
+Requires: php53 >= 5.2.4
+Requires: php53-simplepie >= 1.3.1
 %else
 Requires: php >= 5.2.4
 Requires: php-simplepie >= 1.3.1
@@ -109,7 +110,11 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html}
 # Remove bundled php-simplepie and link to system copy
 rm     ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie
+%if 0%{?rhel} == 5
+ln -sf /usr/share/php/php53-simplepie/autoloader.php \
+%else
 ln -sf /usr/share/php/php-simplepie/autoloader.php \
+%endif
        ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
 
 # Remove bundled PHPMailer and link to system one
@@ -164,6 +169,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Jan 30 2013 Remi Collet <rcollet at redhat.com> - 3.5.1-1.1
+- fix simplepie links (for all branches)
+
 * Wed Jan 30 2013 Remi Collet <rcollet at redhat.com> - 3.5.1-1
 - version 3.5.1, various bug and security fixes:
   CVE-2013-0235, CVE-2013-0236 and CVE-2013-0237


More information about the scm-commits mailing list