summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-03-09 16:27:50 +0100
committerRemi Collet <fedora@famillecollet.com>2016-03-09 16:27:50 +0100
commit5a67a68feddaaf252eef026535e37fa14ebde127 (patch)
tree57cae3dee94ba8ca4c83a0de19a3b4bb403e54f9
parent908013a69601e9690b1a87f35a8a1b16b98c0422 (diff)
php70-php: minor fix (no rebuild required)
-rw-r--r--macros.php1
-rw-r--r--php.spec3
2 files changed, 1 insertions, 3 deletions
diff --git a/macros.php b/macros.php
index b837667..3943a74 100644
--- a/macros.php
+++ b/macros.php
@@ -14,4 +14,3 @@
%@SCL@__php @BINDIR@/php
-
diff --git a/php.spec b/php.spec
index 124b866..8d077fa 100644
--- a/php.spec
+++ b/php.spec
@@ -1030,8 +1030,7 @@ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
-e "s:@SCL@:%{?scl:%{scl}_}:" \
%{SOURCE3} | tee macros.php
%if 0%{?fedora} >= 24
-# Will result as %%php70_pecl_xmldir, thanks to override
-echo '%pecl_xmldir %{_localstatedir}/lib/php/peclxml' >>macros.php
+echo '%%%{?scl:%{scl}_}pecl_xmldir %{_localstatedir}/lib/php/peclxml' | tee -a macros.php
%endif
# php-fpm configuration files for tmpfiles.d