summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-03-07 09:42:54 +0100
committerRemi Collet <fedora@famillecollet.com>2016-03-07 09:42:54 +0100
commit5281c9ee0ed6bd0ff16f22d6de9c12a43a3ea08c (patch)
tree090f4d27dd5ece843e9985b7f370d8d795506893
parentc61415a2ae2952257730ed8b7cbbd96798cb6bfc (diff)
php70: fix override for pecl_xmldir
-rw-r--r--macros-build2
-rw-r--r--php70.spec7
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 <remi@fedoraproject.org> 1.0-3
+- fix override for pecl_xmldir
+
* Tue Jan 5 2016 Remi Collet <remi@fedoraproject.org> 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 <remi@fedoraproject.org> 1.0-0.1
-- initial packaging \ No newline at end of file
+- initial packaging