diff options
Diffstat (limited to 'php-pecl-msgpack.spec')
| -rw-r--r-- | php-pecl-msgpack.spec | 226 |
1 files changed, 128 insertions, 98 deletions
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index 28a51df..9a37a11 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -3,56 +3,57 @@ # # Fedora spec file for php-pecl-msgpack # -# Copyright (c) 2012-2018 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2012-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-msgpack -%endif +%{?scl:%scl_package php-pecl-msgpack} + +# Defined in Fedora >= 37 and RHEL >= 10, in PHP >= 7.4 for remirepo +%{!?__phpize: %global __phpize %{_bindir}/phpize} +%{!?__ztsphpize: %global __ztsphpize %{_bindir}/zts-phpize} +%{!?__phpconfig: %global __phpconfig %{_bindir}/php-config} +%{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config} %global gh_commit 943d27267fbf6da6b4d225f344f4731aec0c671b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner msgpack %global gh_project msgpack-php -#global gh_date 20171026 %global pecl_name msgpack %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%if 0 -%global with_msgpack 1 -%else -%global with_msgpack 0 -%endif +%global upstream_version 2.2.0 +#global upstream_prever RC2 +#global upstream_lower RC2 +%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} +%global _configure ../%{sources}/configure + +# to use system library +%bcond_with msgpack + +# to disable test suite +%bcond_without tests Summary: API for communicating with MessagePack serialization -Name: %{?sub_prefix}php-pecl-msgpack -Version: 2.0.3 -%if 0%{?gh_date:1} -Release: 0.3.%{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 +Name: %{?scl_prefix}php-pecl-msgpack +License: BSD-3-Clause +Version: %{upstream_version}%{?upstream_lower:~%{upstream_lower}} +URL: https://pecl.php.net/package/msgpack Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -%endif -License: BSD -Group: Development/Languages -URL: http://pecl.php.net/package/msgpack - -Patch2: https://patch-diff.githubusercontent.com/raw/msgpack/msgpack-php/pull/125.patch +Source: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 7 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear -%if %{with_msgpack} +%if %{with msgpack} BuildRequires: msgpack-devel +%else +Provides: bundled(msgpack) = 3.2.0 %endif -# https://github.com/msgpack/msgpack-php/issues/25 -ExcludeArch: ppc64 Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -62,40 +63,15 @@ 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} + +%if "%{?packager}" == "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} -%if "%{php_version}" > "7.1" -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 %if "%{php_version}" > "7.3" -Obsoletes: php73u-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.4" +Obsoletes: php74-pecl-%{pecl_name} <= %{version} %endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} %endif @@ -122,10 +98,6 @@ Summary: MessagePack developer files (header) Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{?scl_prefix}php-devel%{?_isa} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name}-devel = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa} = %{version}-%{release} -%endif %description devel @@ -134,35 +106,27 @@ These are the files needed to compile programs using MessagePack serializer. %prep %setup -qc -%if 0%{?gh_date:1} -mv %{gh_project}-%{gh_commit} NTS -mv NTS/package.xml . -sed -e '/release/s/0.5.6/%{version}%{?gh_date:dev}/' -i package.xml -%else -mv %{pecl_name}-%{version} NTS -%endif %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} -cd NTS -%patch2 -p1 -b .pr125 - -%if %{with_msgpack} +cd %{sources} +%if %{with msgpack} # use system library rm -rf msgpack %endif # Sanity check, really often broken extver=$(sed -n '/#define PHP_MSGPACK_VERSION/{s/.* "//;s/".*$//;p}' php_msgpack.h) -if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-dev}. +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then + : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:-dev}. exit 1 fi cd .. +mkdir NTS %if %{with_zts} # duplicate for ZTS build -cp -pr NTS ZTS +mkdir ZTS %endif # Drop in the bit of configuration @@ -181,15 +145,16 @@ EOF %build %{?dtsenable} -cd NTS -%{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config +cd %{sources} +%{__phpize} + +cd ../NTS +%configure --with-php-config=%{__phpconfig} make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config +%configure --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} %endif @@ -211,7 +176,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml # Test & Documentation -cd NTS +cd %{sources} for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') do [ -f tests/$i ] && install -Dpm 644 tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i @@ -222,38 +187,46 @@ done %check -# Erratic results +# Erratic results, segfauilt and mark as XFAIL rm */tests/034.phpt -# Known by upstream as failed test (travis result) -rm */tests/041.phpt -rm */tests/040*.phpt +%ifarch aarch64 +# too slow +rm */tests/035.phpt +%endif -cd NTS +%if "%{php_version}" > "7.4" +OPT="-q --show-diff %{?_smp_mflags}" +%else +OPT="-q --show-diff" +%endif + +cd %{sources} : Minimal load test for NTS extension %{__php} --no-php-ini \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} +%if %{with tests} : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=0 \ -%{__php} -n run-tests.php --show-diff +TEST_PHP_ARGS="-n -d extension_dir=$PWD/../NTS/modules -d extension=%{pecl_name}.so" \ +REPORT_EXIT_STATUS=1 \ +%{__php} -n run-tests.php $OPT +%endif %if %{with_zts} -cd ../ZTS : Minimal load test for ZTS extension %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} +%if %{with tests} : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=0 \ -%{__ztsphp} -n run-tests.php --show-diff +TEST_PHP_ARGS="-n -d extension_dir=$PWD/../ZTS/modules -d extension=%{pecl_name}.so" \ +REPORT_EXIT_STATUS=1 \ +%{__ztsphp} -n run-tests.php $OPT +%endif %endif @@ -278,7 +251,7 @@ fi %files -%{?_licensedir:%license NTS/LICENSE} +%{?_licensedir:%license %{sources}/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -301,6 +274,63 @@ fi %changelog +* Fri Jun 2 2023 Remi Collet <remi@remirepo.net> - 2.2.0-1 +- update to 2.2.0 +- build out of sources tree +- use parallel execution for test suite + +* Fri Oct 7 2022 Remi Collet <remi@remirepo.net> - 2.2.0~RC2-1 +- update to 2.2.0RC2 + +* Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-8 +- ignore 8 failed tests with PHP 8.2 + +* Thu Jul 28 2022 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-7 +- skip one test on aarch64 + +* Mon Sep 6 2021 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-6 +- F35 build + +* Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-4 +- rebuild for 8.1.0RC1 + +* Tue Aug 31 2021 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-1 +- update to 2.2.0RC1 + +* Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 2.1.2-3 +- add patch for test suite with PHP 8.1 from + https://github.com/msgpack/msgpack-php/pull/156 + +* Wed Apr 28 2021 Remi Collet <remi@remirepo.net> - 2.1.2-2 +- F34 rebuild for https://github.com/remicollet/remirepo/issues/174 + +* Sat Nov 28 2020 Remi Collet <remi@remirepo.net> - 2.1.2-1 +- update to 2.1.2 + +* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 2.1.1-3 +- rebuild for PHP 8.0.0RC1 + +* Wed Sep 23 2020 Remi Collet <remi@remirepo.net> - 2.1.1-2 +- add upstream patches for PHP 8 + +* Tue Jul 28 2020 Remi Collet <remi@remirepo.net> - 2.1.1-1 +- update to 2.1.1 + +* Fri Feb 28 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1 +- update to 2.1.0 + +* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 2.1.0~beta1-1 +- update to 2.1.0beta1 + +* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 2.1.0~beta1-0 +- test build for upcoming 2.1.0beta1 + +* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 2.0.3-3 +- rebuild for 7.4.0RC1 + +* Wed May 29 2019 Remi Collet <remi@remirepo.net> - 2.0.3-2 +- rebuild + * Thu Dec 20 2018 Remi Collet <remi@remirepo.net> - 2.0.3-1 - update to 2.0.3 |