diff options
Diffstat (limited to 'php-pecl-pthreads.spec')
| -rw-r--r-- | php-pecl-pthreads.spec | 54 |
1 files changed, 36 insertions, 18 deletions
diff --git a/php-pecl-pthreads.spec b/php-pecl-pthreads.spec index d95c72d..d9d5e3a 100644 --- a/php-pecl-pthreads.spec +++ b/php-pecl-pthreads.spec @@ -8,20 +8,26 @@ # %{?scl: %scl_package php-pecl-pthreads} +%global gh_commit 0c1d9bc96752a8ecba5f024a2288abd05a802546 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner krakjoe +%global gh_project pthreads + %global pecl_name pthreads %global ini_name 40-%{pecl_name}.ini Summary: Threading API Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 3.1.6 +Version: 3.2.0 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 +#Source0: http://pecl.php.net/get/%%{pecl_name}-%%{version}.tgz +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz + +Patch0: https://patch-diff.githubusercontent.com/raw/krakjoe/pthreads/pull/913.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-zts-devel > 7 +BuildRequires: %{?scl_prefix}php-zts-devel > 7.2 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -37,16 +43,20 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %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} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -68,6 +78,11 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c +mv %{gh_project}-%{gh_commit} %{pecl_name}-%{version} +cd %{pecl_name}-%{version} +%patch0 -p1 +cd .. +mv %{pecl_name}-%{version}/package.xml . # Don't install/register tests sed -e 's/role="test"/role="src"/' \ @@ -92,6 +107,8 @@ EOF %build +%{?dtsenable} + cd %{pecl_name}-%{version} %{_bindir}/zts-phpize %configure \ @@ -100,10 +117,9 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} -make -C %{pecl_name}-%{version} \ - install INSTALL_ROOT=%{buildroot} +make -C %{pecl_name}-%{version} install INSTALL_ROOT=%{buildroot} # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} @@ -119,7 +135,7 @@ do sed -e 's/\r//' -i $i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -153,17 +169,13 @@ rm tests/trait-alias-bug.phpt : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +SKIP_ONLINE_TESTS=1 \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{_bindir}/zts-php -n run-tests.php --show-diff -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license %{pecl_name}-%{version}/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -173,6 +185,12 @@ rm -rf %{buildroot} %changelog +* Thu Jan 3 2019 Remi Collet <remi@remirepo.Net> - 3.2.0-1 +- Update to 3.2.0 (stable) +- raise minimal PHP version to 7.2 +- sources from github +- open https://github.com/krakjoe/pthreads/pull/913 file list + * Sat Feb 13 2016 Remi Collet <remi@fedoraproject.org> - 3.1.6-1 - Update to 3.1.6 (stable) |