summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-08-21 14:55:03 +0200
committerRemi Collet <fedora@famillecollet.com>2012-08-21 14:55:03 +0200
commit63bce37a6925caa1004f7d78e5840037479f9533 (patch)
tree5352f6a0bac946a0372682587231f9086699e6b7
parent104bda3440fe0b4d9947eb7262744e1879492afd (diff)
php 5.4: sync with rawhide
-rw-r--r--php54.spec7
1 files changed, 3 insertions, 4 deletions
diff --git a/php54.spec b/php54.spec
index 3788334..3b63a65 100644
--- a/php54.spec
+++ b/php54.spec
@@ -32,14 +32,10 @@
%global with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0}
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 12
-%ifarch %{ix86} x86_64
%global with_fpm 1
%else
%global with_fpm 0
%endif
-%else
-%global with_fpm 0
-%endif
%if 0%{?__isa:1}
%global isasuffix -%{__isa}
@@ -1444,6 +1440,9 @@ fi
%changelog
+* Mon Aug 20 2012 Remi Collet <remi@fedoraproject.org> 5.4.6-2
+- enable php-fpm on secondary arch (#849490)
+
* Thu Aug 16 2012 Remi Collet <remi@fedoraproject.org> 5.4.6-1
- update to 5.4.6