refreshdev317

1 files changed, 27 insertions, 14 deletions

diff --git a/php-pecl-pthreads.spec b/php-pecl-pthreads.spec
index 950d0d1..7519ab9 100644
--- a/php-pecl-pthreads.spec
+++ b/php-pecl-pthreads.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-pthreads
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -8,12 +8,15 @@
 #
 %{?scl:          %scl_package        php-pecl-pthreads}
 
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
 %global pecl_name   pthreads
 %global ini_name    40-%{pecl_name}.ini
 # https://github.com/krakjoe/pthreads/commits/master
-%global gh_commit   61a5e8fa36d243312ecd1f896b11e3f13b16094c
+%global gh_commit   2bc44069c1f3c83c866464b60345a333eacee598
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date     20170123
+%global gh_date     20180217
 %global gh_owner    krakjoe
 %global gh_project  pthreads
 
@@ -21,7 +24,7 @@ Summary:        Threading API
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        3.1.7
 %if 0%{?gh_date:1}
-Release:        0.5.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        0.8.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 %else
 Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
@@ -32,6 +35,7 @@ Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-zts-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 
@@ -50,10 +54,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
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
@@ -64,6 +64,10 @@ Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
 %endif
+%if "%{php_version}" > "7.2"
+Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -121,6 +125,8 @@ EOF
 
 
 %build
+%{?dtsenable}
+
 cd ZTS
 %{_bindir}/zts-phpize
 %configure \
@@ -129,7 +135,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
+%{?dtsenable}
 
 make -C ZTS install INSTALL_ROOT=%{buildroot}
 
@@ -170,8 +176,11 @@ fi
 %check
 cd ZTS
 %ifnarch x86_64
+# Only sign issue
 rm tests/trait-alias-bug.phpt
 %endif
+# Known as failed (upstream travis results)
+rm tests/exception-handler-options.phpt
 
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
@@ -186,12 +195,7 @@ REPORT_EXIT_STATUS=1 \
 %{_bindir}/zts-php -n run-tests.php --show-diff
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license ZTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -201,6 +205,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 21 2018 Remi Collet <remi@remirepo.net> - 3.1.7-0.8.20180217.2bc4406
+- refresh with a newer snapshot
+
+* Sun Dec 10 2017 Remi Collet <remi@remirepo.net> - 3.1.7-0.7.20171210.b3e691f
+- refresh with a newer snapshot
+
+* Thu Aug 31 2017 Remi Collet <remi@remirepo.net> - 3.1.7-0.6.20170827.caca8dc
+- refresh with a newer snapshot
+
 * Thu Mar 23 2017 Remi Collet <remi@remirepo.net> - 3.1.7-0.5.20170123git61a5e8f
 - refresh with a newer snapshot