diff options
Diffstat (limited to 'php-pecl-yaf.spec')
| -rw-r--r-- | php-pecl-yaf.spec | 135 |
1 files changed, 96 insertions, 39 deletions
diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec index f3742e5..af4873a 100644 --- a/php-pecl-yaf.spec +++ b/php-pecl-yaf.spec @@ -7,35 +7,35 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} -%endif +%scl_package php-pecl-yaf %endif -%{?scl: %scl_package php-pecl-yaf} - -%global with_zts 0%{?__ztsphp:1} -%global pecl_name yaf -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else -%global ini_name 40-%{pecl_name}.ini -%endif +%global gh_commit 51e458e9746d7061efc565d49baaca26feacd7ff +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner laruence +%global gh_project yaf +#global gh_date 20150914 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name yaf +%global ini_name 40-%{pecl_name}.ini Summary: Yet Another Framework Name: %{?sub_prefix}php-pecl-yaf -Version: 2.3.5 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 3.0.4 +%if 0%{?gh_date:1} +Release: 0.9.%{gh_date}git%{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: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +%endif License: PHP Group: Development/Languages URL: http://pecl.php.net/package/yaf -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Source1: %{pecl_name}.ini -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: %{?scl_prefix}php-devel >= 5.2.0 +BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel @@ -47,8 +47,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} && 0%{?rhel} # Other third party repo stuff @@ -56,13 +58,15 @@ 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} +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -81,8 +85,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep -%setup -q -c +%setup -qc +%if 0%{?gh_date:1} +mv %{gh_project}-%{gh_commit} NTS +mv NTS/package.xml . +%else mv %{pecl_name}-%{version} NTS +%endif # Don't install/register tests sed -e 's/role="test"/role="src"/' \ @@ -90,10 +99,11 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS + # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h ) -if test "x${extver}" != "x%{version}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}. +if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-dev}. exit 1 fi cd .. @@ -119,7 +129,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} @@ -140,6 +149,8 @@ done %check +sed -e 's/Catchable/%s/' -i ?TS/tests/022.phpt + cd NTS : Minimal load test for NTS extension %{__php} --no-php-ini \ @@ -151,10 +162,13 @@ TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php +%{__php} -n run-tests.php --show-diff %if %{with_zts} cd ../ZTS +# https://github.com/laruence/php-yaf/issues/180 +rm tests/016.phpt + : Minimal load test for ZTS extension %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ @@ -165,7 +179,7 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php +%{__ztsphp} -n run-tests.php --show-diff %endif @@ -189,12 +203,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -209,17 +218,65 @@ rm -rf %{buildroot} %changelog -* Wed Mar 9 2016 Remi Collet <remi@fedoraproject.org> - 2.3.5-2 +* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 3.0.4-3 +- rebuild with PHP 7.1.0 GA + +* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.0.4-2 +- rebuild for PHP 7.1 new API version + +* Thu Sep 1 2016 Remi Collet <remi@fedoraproject.org> - 3.0.4-1 +- update to 3.0.4 + +* Sat Jul 2 2016 Remi Collet <remi@fedoraproject.org> - 3.0.3-1 +- update to 3.0.3 +- drop patch merged upstream + +* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 3.0.2-3 +- add patch for PHP 7.1 + open https://github.com/laruence/yaf/pull/289 + +* Sun Mar 6 2016 Remi Collet <remi@fedoraproject.org> - 3.0.2-2 - adapt for F24 -* Sun Sep 6 2015 Remi Collet <remi@fedoraproject.org> - 2.3.5-1 -- Update to 2.3.5 +* Mon Dec 28 2015 Remi Collet <remi@fedoraproject.org> - 3.0.2-1 +- update to 3.0.2 (beta, php 7) + +* Sun Dec 13 2015 Remi Collet <remi@fedoraproject.org> - 3.0.1-1 +- update to 3.0.1 (beta, php 7) + +* Tue Oct 27 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-1 +- update to 3.0.0 (php 7) + +* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.8.20150914gitaeb6457 +- rebuild for PHP 7.0.0RC5 new API version +- new snapshot + +* Sun Sep 6 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.7.20150906git63222a2 +- new shapshot (changes from 2.3.5) + +* Thu Aug 13 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.6.20150813git2dd49ab +- new shapshot + +* Fri Jul 24 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.6.20150720git629d412 +- ignore 1 failed test on ZTS +- open https://github.com/laruence/php-yaf/issues/180 (1 failed on ZTS) + +* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.5.20150720git629d412 +- rebuild against php 7.0.0beta2 + +* Wed Jul 8 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.4.20150701gitfb20f6c +- rebuild against php 7.0.0beta1 + +* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.3.20150618gita40f01e +- new snapshot +- rebuild for "rh_layout" -* Thu Aug 13 2015 Remi Collet <remi@fedoraproject.org> - 2.3.4-1 -- Update to 2.3.4 +* Wed Jun 17 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.2.20150612gita1bd3ac +- rebuild -* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 2.3.3-2 -- allow build against rh-php56 (as more-php56) +* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.1.20150612gita1bd3ac +- Update to 3.0.0-dev for PHP 7 +- sources from github - drop runtime dependency on pear, new scriptlets * Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 2.3.3-1.1 |