summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-03-10 06:47:36 +0100
committerRemi Collet <fedora@famillecollet.com>2016-03-10 06:47:36 +0100
commitf4a44f6c798be9f723c7f05d5d8a2ed1b2f0fd62 (patch)
tree9670561f7997bb2a66c461d50c375a41acac822f
parent1e1fd683f60d970aeda4b41642170ef5034281ec (diff)
php55: F24
-rw-r--r--macros-build2
-rw-r--r--php55.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/php55.spec b/php55.spec
index c5c5705..8321a60 100644
--- a/php55.spec
+++ b/php55.spec
@@ -16,7 +16,7 @@
Summary: Package that installs PHP 5.5
Name: %scl_name
Version: 2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Development/Languages
License: GPLv2+
@@ -187,6 +187,9 @@ restorecon -R %{?_scl_root} &>/dev/null || :
%changelog
+* Thu Mar 10 2016 Remi Collet <remi@fedoraproject.org> 2.1-4
+- fix override for pecl_xmldir
+
* Tue Jan 5 2016 Remi Collet <remi@fedoraproject.org> 2.1-3
- add missing "sbin" in PATH (Fedora)
@@ -237,4 +240,4 @@ restorecon -R %{?_scl_root} &>/dev/null || :
- add macros.php55-build for scl_package_override
* Fri Aug 2 2013 Remi Collet <rcollet@redhat.com> 1-1
-- initial packaging \ No newline at end of file
+- initial packaging