Compare commits
20 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
134bf5cb18 | ||
|
882efb70bb | ||
|
30a9b45dc6 | ||
|
1db42ab386 | ||
|
1bc4c16f3d | ||
|
54fc28d0ca | ||
|
ad52d6d60f | ||
|
904778b89d | ||
|
5f4d1050a4 | ||
|
864c596b33 | ||
|
d51844d8c0 | ||
|
ea42db6eaa | ||
|
246ff5fd20 | ||
|
f36e05bc19 | ||
|
99aabfd520 | ||
|
5c50da9bdd | ||
|
1e875b5b26 | ||
|
902005deb0 | ||
|
57517c8951 | ||
|
0cea3ac9d5 |
8
.gitignore
vendored
8
.gitignore
vendored
@ -3,3 +3,11 @@ clog
|
|||||||
/msgpack-0.5.7.tgz
|
/msgpack-0.5.7.tgz
|
||||||
/msgpack-2.0.1.tgz
|
/msgpack-2.0.1.tgz
|
||||||
/msgpack-2.0.2.tgz
|
/msgpack-2.0.2.tgz
|
||||||
|
/msgpack-2.0.3-943d272.tar.gz
|
||||||
|
/msgpack-2.0.3.tgz
|
||||||
|
/msgpack-2.1.0beta1.tgz
|
||||||
|
/msgpack-2.1.0.tgz
|
||||||
|
/msgpack-2.1.1.tgz
|
||||||
|
/msgpack-2.1.2.tgz
|
||||||
|
/msgpack-2.2.0RC1.tgz
|
||||||
|
/msgpack-2.2.0RC2.tgz
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
From 99f9db8cd68cf458b330047b8d1cc0f15240abf2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Remi Collet <remi@remirepo.net>
|
|
||||||
Date: Fri, 14 Apr 2017 09:23:39 +0200
|
|
||||||
Subject: [PATCH] use spl_autoload_register (to avoid deprecation warning with
|
|
||||||
7.2)
|
|
||||||
|
|
||||||
---
|
|
||||||
tests/019.phpt | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tests/019.phpt b/tests/019.phpt
|
|
||||||
index 46cccb3..693f5cf 100644
|
|
||||||
--- a/tests/019.phpt
|
|
||||||
+++ b/tests/019.phpt
|
|
||||||
@@ -17,7 +17,7 @@ function test($type, $variable, $test) {
|
|
||||||
echo $test || $unserialized->b == 2 ? 'OK' : 'ERROR', PHP_EOL;
|
|
||||||
}
|
|
||||||
|
|
||||||
-function __autoload($classname) {
|
|
||||||
+function test_autoload($classname) {
|
|
||||||
class Obj {
|
|
||||||
var $a;
|
|
||||||
var $b;
|
|
||||||
@@ -28,6 +28,7 @@ function __autoload($classname) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+spl_autoload_register('test_autoload');
|
|
||||||
|
|
||||||
test('autoload', '83c0a34f626aa16101a16202', false);
|
|
||||||
?>
|
|
@ -1,6 +1,6 @@
|
|||||||
# Fedora spec file for php-pecl-msgpack
|
# Fedora spec file for php-pecl-msgpack
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012-2018 Remi Collet
|
# Copyright (c) 2012-2022 Remi Collet
|
||||||
# License: CC-BY-SA
|
# License: CC-BY-SA
|
||||||
# http://creativecommons.org/licenses/by-sa/4.0/
|
# http://creativecommons.org/licenses/by-sa/4.0/
|
||||||
#
|
#
|
||||||
@ -10,33 +10,32 @@
|
|||||||
# we don't want -z defs linker flag
|
# we don't want -z defs linker flag
|
||||||
%undefine _strict_symbol_defs_build
|
%undefine _strict_symbol_defs_build
|
||||||
|
|
||||||
|
%global upstream_version 2.2.0
|
||||||
|
%global upstream_prever RC2
|
||||||
|
%global upstream_lower RC2
|
||||||
|
|
||||||
%global pecl_name msgpack
|
%global pecl_name msgpack
|
||||||
%global with_zts 0%{?__ztsphp:1}
|
%global with_zts 0%{?__ztsphp:1}
|
||||||
%global ini_name 40-%{pecl_name}.ini
|
%global ini_name 40-%{pecl_name}.ini
|
||||||
# system library is outdated, and bundled library includes not yet released changes
|
# system library is outdated, and bundled library includes not yet released changes
|
||||||
# e.g. missing template_callback_str in 1.4.1
|
# BTW, only pack_template.h and unpack_template.h headers are used
|
||||||
%global with_msgpack 0
|
%global with_msgpack 0
|
||||||
|
|
||||||
Summary: API for communicating with MessagePack serialization
|
Summary: API for communicating with MessagePack serialization
|
||||||
Name: php-pecl-msgpack
|
Name: php-pecl-msgpack
|
||||||
Version: 2.0.2
|
Version: %{upstream_version}%{?upstream_lower:~%{upstream_lower}}
|
||||||
Release: 8%{?dist}
|
Release: 1%{?dist}
|
||||||
|
Source: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: Development/Languages
|
URL: https://pecl.php.net/package/msgpack
|
||||||
URL: http://pecl.php.net/package/msgpack
|
|
||||||
Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
|
|
||||||
|
|
||||||
Patch0: %{pecl_name}-pr118.patch
|
BuildRequires: php-devel >= 7.0
|
||||||
|
|
||||||
BuildRequires: php-devel > 7
|
|
||||||
BuildRequires: php-pear
|
BuildRequires: php-pear
|
||||||
%if %{with_msgpack}
|
%if %{with_msgpack}
|
||||||
BuildRequires: msgpack-devel
|
BuildRequires: msgpack-devel
|
||||||
%else
|
%else
|
||||||
Provides: bundled(msgpack)
|
Provides: bundled(msgpack) = 3.2.0
|
||||||
%endif
|
%endif
|
||||||
# https://github.com/msgpack/msgpack-php/issues/25
|
|
||||||
ExcludeArch: ppc64
|
|
||||||
|
|
||||||
Requires: php(zend-abi) = %{php_zend_api}
|
Requires: php(zend-abi) = %{php_zend_api}
|
||||||
Requires: php(api) = %{php_core_api}
|
Requires: php(api) = %{php_core_api}
|
||||||
@ -65,7 +64,6 @@ This extension is still EXPERIMENTAL.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: MessagePack developer files (header)
|
Summary: MessagePack developer files (header)
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
|
Requires: php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: php-devel%{?_isa}
|
Requires: php-devel%{?_isa}
|
||||||
|
|
||||||
@ -74,14 +72,12 @@ These are the files needed to compile programs using MessagePack serializer.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -qc
|
||||||
|
mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
|
||||||
|
|
||||||
mv %{pecl_name}-%{version} NTS
|
|
||||||
sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
|
sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
|
||||||
|
|
||||||
cd NTS
|
cd NTS
|
||||||
%patch0 -p1 -b .pr118
|
|
||||||
|
|
||||||
%if %{with_msgpack}
|
%if %{with_msgpack}
|
||||||
# use system library
|
# use system library
|
||||||
rm -rf msgpack
|
rm -rf msgpack
|
||||||
@ -92,8 +88,8 @@ rm -rf msgpack
|
|||||||
|
|
||||||
# Sanity check, really often broken
|
# Sanity check, really often broken
|
||||||
extver=$(sed -n '/#define PHP_MSGPACK_VERSION/{s/.* "//;s/".*$//;p}' php_msgpack.h)
|
extver=$(sed -n '/#define PHP_MSGPACK_VERSION/{s/.* "//;s/".*$//;p}' php_msgpack.h)
|
||||||
if test "x${extver}" != "x%{version}"; then
|
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then
|
||||||
: Error: Upstream extension version is ${extver}, expecting %{version}.
|
: Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:-dev}.
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cd ..
|
cd ..
|
||||||
@ -147,7 +143,8 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
|
|||||||
# Test & Documentation
|
# Test & Documentation
|
||||||
cd NTS
|
cd NTS
|
||||||
for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
|
for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
|
||||||
do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
|
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
|
||||||
done
|
done
|
||||||
for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
|
for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
|
||||||
do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
|
do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
|
||||||
@ -157,11 +154,10 @@ done
|
|||||||
%check
|
%check
|
||||||
# Erratic results
|
# Erratic results
|
||||||
rm */tests/034.phpt
|
rm */tests/034.phpt
|
||||||
# Benchmark failing on slow arm builder
|
%ifarch aarch64
|
||||||
|
# too slow
|
||||||
rm */tests/035.phpt
|
rm */tests/035.phpt
|
||||||
# Known by upstream as failed test (travis result)
|
%endif
|
||||||
rm */tests/041.phpt
|
|
||||||
rm */tests/040*.phpt
|
|
||||||
|
|
||||||
cd NTS
|
cd NTS
|
||||||
: Minimal load test for NTS extension
|
: Minimal load test for NTS extension
|
||||||
@ -172,9 +168,7 @@ cd NTS
|
|||||||
: Upstream test suite for NTS extension
|
: Upstream test suite for NTS extension
|
||||||
TEST_PHP_EXECUTABLE=%{_bindir}/php \
|
TEST_PHP_EXECUTABLE=%{_bindir}/php \
|
||||||
TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
|
TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
|
||||||
NO_INTERACTION=1 \
|
%{_bindir}/php -n run-tests.php -q --show-diff
|
||||||
REPORT_EXIT_STATUS=1 \
|
|
||||||
%{_bindir}/php -n run-tests.php --show-diff
|
|
||||||
|
|
||||||
%if %{with_zts}
|
%if %{with_zts}
|
||||||
cd ../ZTS
|
cd ../ZTS
|
||||||
@ -186,9 +180,7 @@ cd ../ZTS
|
|||||||
: Upstream test suite for ZTS extension
|
: Upstream test suite for ZTS extension
|
||||||
TEST_PHP_EXECUTABLE=%{__ztsphp} \
|
TEST_PHP_EXECUTABLE=%{__ztsphp} \
|
||||||
TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
|
TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
|
||||||
NO_INTERACTION=1 \
|
%{__ztsphp} -n run-tests.php -q --show-diff
|
||||||
REPORT_EXIT_STATUS=1 \
|
|
||||||
%{__ztsphp} -n run-tests.php --show-diff
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -216,6 +208,67 @@ REPORT_EXIT_STATUS=1 \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 7 2022 Remi Collet <remi@remirepo.net> - 2.2.0~RC2-1
|
||||||
|
- update to 2.2.0RC2
|
||||||
|
|
||||||
|
* Wed Oct 05 2022 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-4
|
||||||
|
- rebuild for https://fedoraproject.org/wiki/Changes/php82
|
||||||
|
|
||||||
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0~RC1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0~RC1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Oct 28 2021 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-1
|
||||||
|
- update to 2.2.0RC1
|
||||||
|
- rebuild for https://fedoraproject.org/wiki/Changes/php81
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Mar 4 2021 Remi Collet <remi@remirepo.net> - 2.1.2-2
|
||||||
|
- rebuild for https://fedoraproject.org/wiki/Changes/php80
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 2.1.2-1
|
||||||
|
- update to 2.1.2
|
||||||
|
|
||||||
|
* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 2.1.1-1
|
||||||
|
- update to 2.1.1
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Mar 2 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
|
||||||
|
- update to 2.1.0
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0~beta1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 2.1.0~beta1-1
|
||||||
|
- update to 2.1.0beta1
|
||||||
|
|
||||||
|
* Thu Oct 03 2019 Remi Collet <remi@remirepo.net> - 2.0.3-4
|
||||||
|
- rebuild for https://fedoraproject.org/wiki/Changes/php74
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Dec 20 2018 Remi Collet <remi@remirepo.net> - 2.0.3-1
|
||||||
|
- update to 2.0.3
|
||||||
|
|
||||||
|
* Thu Oct 11 2018 Remi Collet <remi@remirepo.net> - 2.0.3-0.1.20171026.943d272
|
||||||
|
- update to 2.0.3-dev for PHP 7.3 with patches from
|
||||||
|
https://github.com/msgpack/msgpack-php/pull/124
|
||||||
|
https://github.com/msgpack/msgpack-php/pull/127
|
||||||
|
- ignore test suite result for now
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-8
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user