From 5281c9ee0ed6bd0ff16f22d6de9c12a43a3ea08c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Mar 2016 09:42:54 +0100 Subject: php70: fix override for pecl_xmldir --- macros-build | 2 +- php70.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/macros-build b/macros-build index 6a9f923..03ff02d 100644 --- a/macros-build +++ b/macros-build @@ -4,9 +4,9 @@ %{?@SCL@___pear:%global __pear %@SCL@___pear} %{?@SCL@___pecl:%global __pecl %@SCL@___pecl} %{?@SCL@___php:%global __php %@SCL@___php} + %{?@SCL@_pecl_xmldir:%global pecl_xmldir %@SCL@_pecl_xmldir} %global pear_metadir %@SCL@_pear_metadir %global pear_xmldir %@SCL@_pear_xmldir - %global pecl_xmldir %@SCL@_pecl_xmldir %global php_core_api %@SCL@_php_core_api %global php_zend_api %@SCL@_php_zend_api %global php_pdo_api %@SCL@_php_pdo_api diff --git a/php70.spec b/php70.spec index f4afa06..c59a2ac 100644 --- a/php70.spec +++ b/php70.spec @@ -19,7 +19,7 @@ Summary: Package that installs PHP 7.0 Name: %scl_name Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2+ @@ -202,6 +202,9 @@ restorecon -R %{_localstatedir} &>/dev/null || : %changelog +* Mon Mar 7 2016 Remi Collet 1.0-3 +- fix override for pecl_xmldir + * Tue Jan 5 2016 Remi Collet 1.0-2 - add missing "sbin" in PATH (Fedora) @@ -226,4 +229,4 @@ restorecon -R %{_localstatedir} &>/dev/null || : - own directories for pecl packages * Wed Mar 25 2015 Remi Collet 1.0-0.1 -- initial packaging \ No newline at end of file +- initial packaging -- cgit