summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-07-21 19:46:13 +0200
committerRemi Collet <fedora@famillecollet.com>2014-07-21 19:46:13 +0200
commitbf8b135ce0c5a26466be6543f52fe78e5bfb6e16 (patch)
treeeb11af516d096430ab8a1db7f488a9e9dffd3912
parentdce884a7d857c03af09c1bdb5dd6b29712597bdf (diff)
php54-extras add tidy
-rw-r--r--php-extras.spec15
1 files changed, 11 insertions, 4 deletions
diff --git a/php-extras.spec b/php-extras.spec
index 954ce76..ad167ff 100644
--- a/php-extras.spec
+++ b/php-extras.spec
@@ -9,23 +9,27 @@
%define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
-%{expand:%def imap}
%{expand:%def interbase}
%{expand:%def mcrypt}
%{expand:%def mssql}
+%if 0%{?rhel} != 6
+%{expand:%def tidy}
+%endif
%if 0%{?rhel} < 6
%{expand:%def recode}
-%{expand:%def tidy}
%{expand:%def enchant}
%endif
+%if 0%{?rhel} > 6 || 0%{?fedora} > 0
+%{expand:%def imap}
+%endif
%define list %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird} %{?_with_enchant:enchant} %{?_with_imap:imap} %{?_with_imap:imap}
-%define opts %{?_with_interbase:--with-interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird} %{?_with_imap:--with-imap-ssl --with-kerberos}
+%define opts %{?_with_interbase:--with-interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird} %{?_with_imap:--with-imap-ssl --with-kerberos}
Name: %{?scl_prefix}php-extras
Summary: Additional PHP modules from the standard PHP distribution
Version: 5.4.16
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Development/Languages
License: The PHP License
URL: http://www.php.net/
@@ -238,6 +242,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jul 21 2014 Remi Collet <rcollet@redhat.com> - 5.4.16-5
+- add tidy for rhel-7
+
* Mon Jul 21 2014 Remi Collet <rcollet@redhat.com> - 5.4.16-4
- add imap for rhel-7