switch the spec

1 files changed, 58 insertions, 22 deletions

diff --git a/php-pecl-pthreads.spec b/php-pecl-pthreads.spec
index 59021a7..d95c72d 100644
--- a/php-pecl-pthreads.spec
+++ b/php-pecl-pthreads.spec
@@ -7,40 +7,33 @@
 # Please, preserve the changelog entries
 #
 %{?scl:          %scl_package        php-pecl-pthreads}
-%{!?php_inidir:  %global php_inidir  %{_sysconfdir}/php.d}
-%{!?__pecl:      %global __pecl      %{_bindir}/pecl}
-%{!?__php:       %global __php       %{_bindir}/php}
 
 %global pecl_name pthreads
-%if "%{php_version}" < "5.6"
-%global ini_name  %{pecl_name}.ini
-%else
 %global ini_name  40-%{pecl_name}.ini
-%endif
 
 Summary:        Threading API
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        2.0.10
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        3.1.6
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  %{?scl_prefix}php-zts-devel > 5.3
+BuildRequires:  %{?scl_prefix}php-zts-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
-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_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}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
+Provides:       %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
+Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
@@ -48,14 +41,12 @@ Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
-%endif
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -150,6 +141,9 @@ fi
 
 %check
 cd %{pecl_name}-%{version}
+%ifnarch x86_64
+rm tests/trait-alias-bug.phpt
+%endif
 
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
@@ -161,7 +155,7 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{_bindir}/zts-php -n run-tests.php
+%{_bindir}/zts-php -n run-tests.php --show-diff
 
 
 %clean
@@ -179,8 +173,50 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 2.0.10-2
-- adapt for F24
+* Sat Feb 13 2016 Remi Collet <remi@fedoraproject.org> - 3.1.6-1
+- Update to 3.1.6 (stable)
+
+* Sun Dec  6 2015 Remi Collet <remi@fedoraproject.org> - 3.1.5-1
+- Update to 3.1.5 (stable)
+
+* Wed Dec  2 2015 Remi Collet <remi@fedoraproject.org> - 3.1.4-2
+- add upstream patch to fix segfault on i386
+  https://github.com/krakjoe/pthreads/issues/523
+
+* Wed Dec  2 2015 Remi Collet <remi@fedoraproject.org> - 3.1.4-1
+- Update to 3.1.4 (stable)
+
+* Wed Nov 25 2015 Remi Collet <remi@fedoraproject.org> - 3.1.3-1
+- Update to 3.1.3 (stable)
+- open https://github.com/krakjoe/pthreads/issues/523 segfault on i386
+
+* Wed Oct  7 2015 Remi Collet <remi@fedoraproject.org> - 3.0.8-1
+- Update to 3.0.8 (stable)
+
+* Sun Sep 27 2015 Remi Collet <remi@fedoraproject.org> - 3.0.7-1
+- Update to 3.0.7 (stable)
+
+* Tue Sep 22 2015 Remi Collet <remi@fedoraproject.org> - 3.0.6-1
+- Update to 3.0.6 (stable)
+
+* Mon Sep 21 2015 Remi Collet <remi@fedoraproject.org> - 3.0.5-1
+- Update to 3.0.5 (stable)
+
+* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 3.0.4-1
+- Update to 3.0.4 (stable)
+
+* Thu Sep 17 2015 Remi Collet <remi@fedoraproject.org> - 3.0.3-1
+- Update to 3.0.3 (stable)
+
+* Sun Sep 13 2015 Remi Collet <remi@fedoraproject.org> - 3.0.2-1
+- Update to 3.0.2 (stable)
+
+* Thu Sep 10 2015 Remi Collet <remi@fedoraproject.org> - 3.0.1-1
+- Update to 3.0.1 (stable)
+
+* Thu Sep 10 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
+- Update to 3.0.0 (stable)
+- raise minimum PHP version to 7
 
 * Wed Oct 01 2014 Remi Collet <remi@fedoraproject.org> - 2.0.10-1
 - Update to 2.0.10 (stable)