summaryrefslogtreecommitdiffstats
path: root/php-pecl-hprose.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-05 15:46:21 +0200
committerRemi Collet <remi@remirepo.net>2019-06-05 15:46:21 +0200
commiteaa92794c21b4a3fb8d5078a5709037aa1e053b0 (patch)
tree5d03775bea57cf3294166461172fdd2140183758 /php-pecl-hprose.spec
parent213208e00c82f0866a34039669a037c0f1d253b4 (diff)
- update to 1.6.7
- drop patch merged upstream
Diffstat (limited to 'php-pecl-hprose.spec')
-rw-r--r--php-pecl-hprose.spec28
1 files changed, 12 insertions, 16 deletions
diff --git a/php-pecl-hprose.spec b/php-pecl-hprose.spec
index 0d292d0..01b8ecc 100644
--- a/php-pecl-hprose.spec
+++ b/php-pecl-hprose.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-hprose
#
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -22,14 +22,12 @@
Summary: Hprose for PHP
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 1.6.6
-Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 1.6.7
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: MIT
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-Patch0: https://patch-diff.githubusercontent.com/raw/hprose/hprose-pecl/pull/14.patch
-
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
@@ -49,14 +47,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-%if "%{php_version}" > "5.6"
-Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
-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}
@@ -66,9 +56,13 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
%endif
%if "%{php_version}" > "7.3"
-Obsoletes: php73u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php73-pecl-%{pecl_name} <= %{version}
Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.4"
+Obsoletes: php74-pecl-%{pecl_name} <= %{version}
+Obsoletes: php74w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -106,8 +100,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .pr14
-
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_HPROSE_VERSION/{s/.* "//;s/".*$//;p}' php_hprose.h)
if test "x${extver}" != "x%{version}"; then
@@ -242,6 +234,10 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Wed Jun 5 2019 Remi Collet <remi@remirepo.net> - 1.6.7-1
+- update to 1.6.7
+- drop patch merged upstream
+
* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 1.6.6-5
- rebuild for 7.3.0beta2 new ABI