summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-hprose.spec19
2 files changed, 16 insertions, 5 deletions
diff --git a/REFLECTION b/REFLECTION
index 8526556..98a35c5 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #104 hprose version 1.6.4 ] {
+Extension [ <persistent> extension #104 hprose version 1.6.5 ] {
- Functions {
Function [ <internal:hprose> function hprose_serialize ] {
diff --git a/php-pecl-hprose.spec b/php-pecl-hprose.spec
index 2f7094c..aed0eaa 100644
--- a/php-pecl-hprose.spec
+++ b/php-pecl-hprose.spec
@@ -12,10 +12,9 @@
%else
%global sub_prefix %{scl_prefix}
%endif
+%scl_package php-pecl-hprose
%endif
-%{?scl: %scl_package php-pecl-hprose}
-
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name hprose
%global with_tests 0%{!?_without_tests:1}
@@ -27,8 +26,8 @@
Summary: Hprose for PHP
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 1.6.4
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 1.6.5
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: MIT
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -46,8 +45,10 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
+%endif
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
@@ -67,6 +68,10 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
Obsoletes: php70u-pecl-%{pecl_name} <= %{version}
Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.1"
+Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -242,6 +247,12 @@ rm -rf %{buildroot}
%changelog
+* Fri Jun 10 2016 Remi Collet <remi@fedoraproject.org> - 1.6.5-1
+- Update to 1.6.5
+
+* Fri Jun 10 2016 Remi Collet <remi@fedoraproject.org> - 1.6.4-3
+- add upstream patch for PHP 7.1
+
* Sat Mar 5 2016 Remi Collet <remi@fedoraproject.org> - 1.6.4-2
- adapt for F24