From 8da1ae39eccbfff8fdf2036908fe001d95238486 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 10 Mar 2016 13:34:40 +0100 Subject: fix override for pecl_xmldir (F24) --- macros-build | 2 +- php54.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/php54.spec b/php54.spec index 8c7dba6..f9d77f0 100644 --- a/php54.spec +++ b/php54.spec @@ -16,7 +16,7 @@ Summary: Package that installs PHP 5.4 Name: %scl_name Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPLv2+ @@ -190,6 +190,9 @@ restorecon -R %{?_scl_root} &>/dev/null || : %changelog +* Thu Mar 10 2016 Remi Collet 2.1-4 +- fix override for pecl_xmldir + * Tue Jan 5 2016 Remi Collet 2.1-3 - add missing "sbin" in PATH (Fedora) @@ -244,4 +247,4 @@ restorecon -R %{?_scl_root} &>/dev/null || : - add macros.php55-build for scl_package_override * Fri Aug 2 2013 Remi Collet 1-1 -- initial packaging \ No newline at end of file +- initial packaging -- cgit