summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION6
-rw-r--r--REFLECTION-PHP7173
-rw-r--r--php-pecl-msgpack-php7.spec381
-rw-r--r--php-pecl-msgpack.spec129
4 files changed, 91 insertions, 598 deletions
diff --git a/REFLECTION b/REFLECTION
index 40ced0f..194891d 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #126 msgpack version 0.5.7 ] {
+Extension [ <persistent> extension #107 msgpack version 2.0.2 ] {
- INI {
Entry [ msgpack.error_display <ALL> ]
@@ -15,6 +15,10 @@ Extension [ <persistent> extension #126 msgpack version 0.5.7 ] {
}
}
+ - Constants [1] {
+ Constant [ integer MESSAGEPACK_OPT_PHPONLY ] { -1001 }
+ }
+
- Functions {
Function [ <internal:msgpack> function msgpack_serialize ] {
diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7
deleted file mode 100644
index 194891d..0000000
--- a/REFLECTION-PHP7
+++ /dev/null
@@ -1,173 +0,0 @@
-Extension [ <persistent> extension #107 msgpack version 2.0.2 ] {
-
- - INI {
- Entry [ msgpack.error_display <ALL> ]
- Current = '1'
- }
- Entry [ msgpack.php_only <ALL> ]
- Current = '1'
- }
- Entry [ msgpack.illegal_key_insert <ALL> ]
- Current = '0'
- }
- Entry [ msgpack.use_str8_serialization <ALL> ]
- Current = '1'
- }
- }
-
- - Constants [1] {
- Constant [ integer MESSAGEPACK_OPT_PHPONLY ] { -1001 }
- }
-
- - Functions {
- Function [ <internal:msgpack> function msgpack_serialize ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $value ]
- }
- }
- Function [ <internal:msgpack> function msgpack_unserialize ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $str ]
- Parameter #1 [ <optional> $object ]
- }
- }
- Function [ <internal:msgpack> function msgpack_pack ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $value ]
- }
- }
- Function [ <internal:msgpack> function msgpack_unpack ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $str ]
- Parameter #1 [ <optional> $object ]
- }
- }
- }
-
- - Classes [2] {
- Class [ <internal:msgpack> class MessagePack ] {
-
- - Constants [1] {
- Constant [ integer OPT_PHPONLY ] { -1001 }
- }
-
- - Static properties [0] {
- }
-
- - Static methods [0] {
- }
-
- - Properties [0] {
- }
-
- - Methods [5] {
- Method [ <internal:msgpack, ctor> public method __construct ] {
-
- - Parameters [1] {
- Parameter #0 [ <optional> $opt ]
- }
- }
-
- Method [ <internal:msgpack> public method setOption ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $option ]
- Parameter #1 [ <required> $value ]
- }
- }
-
- Method [ <internal:msgpack> public method pack ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $value ]
- }
- }
-
- Method [ <internal:msgpack> public method unpack ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $str ]
- Parameter #1 [ <optional> $object ]
- }
- }
-
- Method [ <internal:msgpack> public method unpacker ] {
-
- - Parameters [0] {
- }
- }
- }
- }
-
- Class [ <internal:msgpack> class MessagePackUnpacker ] {
-
- - Constants [0] {
- }
-
- - Static properties [0] {
- }
-
- - Static methods [0] {
- }
-
- - Properties [0] {
- }
-
- - Methods [7] {
- Method [ <internal:msgpack, ctor> public method __construct ] {
-
- - Parameters [1] {
- Parameter #0 [ <optional> $opt ]
- }
- }
-
- Method [ <internal:msgpack, dtor> public method __destruct ] {
-
- - Parameters [0] {
- }
- }
-
- Method [ <internal:msgpack> public method setOption ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $option ]
- Parameter #1 [ <required> $value ]
- }
- }
-
- Method [ <internal:msgpack> public method feed ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $str ]
- }
- }
-
- Method [ <internal:msgpack> public method execute ] {
-
- - Parameters [2] {
- Parameter #0 [ <optional> $str ]
- Parameter #1 [ <optional> &$offset ]
- }
- }
-
- Method [ <internal:msgpack> public method data ] {
-
- - Parameters [1] {
- Parameter #0 [ <optional> $object ]
- }
- }
-
- Method [ <internal:msgpack> public method reset ] {
-
- - Parameters [0] {
- }
- }
- }
- }
- }
-}
-
diff --git a/php-pecl-msgpack-php7.spec b/php-pecl-msgpack-php7.spec
deleted file mode 100644
index 5d4bcd1..0000000
--- a/php-pecl-msgpack-php7.spec
+++ /dev/null
@@ -1,381 +0,0 @@
-# remirepo spec file for php-pecl-msgpack
-# with SCL compatibility, from:
-#
-# Fedora spec file for php-pecl-msgpack
-#
-# Copyright (c) 2012-2017 Remi Collet
-# License: CC-BY-SA
-# 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
-
-%global gh_commit b29f3fd572b9d2ad8c053efa6279f93862f63657
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner msgpack
-%global gh_project msgpack-php
-#global gh_date 20151014
-%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
-
-Summary: API for communicating with MessagePack serialization
-Name: %{?sub_prefix}php-pecl-msgpack
-Version: 2.0.2
-%if 0%{?gh_date:1}
-Release: 0.2.%{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: 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
-
-BuildRequires: %{?scl_prefix}php-devel >= 7
-BuildRequires: %{?scl_prefix}php-pear
-%if %{with_msgpack}
-BuildRequires: msgpack-devel
-%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}
-%{?_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(%{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
-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
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
-
-%description
-This extension provide API for communicating with MessagePack serialization.
-
-MessagePack is an efficient binary serialization format. It lets you exchange
-data among multiple languages like JSON but it's faster and smaller.
-For example, small integers (like flags or error code) are encoded into a
-single byte, and typical short strings only require an extra byte in addition
-to the strings themselves.
-
-If you ever wished to use JSON for convenience (storing an image with metadata)
-but could not for technical reasons (encoding, size, speed...), MessagePack is
-a perfect replacement.
-
-This extension is still EXPERIMENTAL.
-
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
-
-
-%package devel
-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
-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
-%if %{with_msgpack}
-# use system library
-rm -rf msgpack
-%endif
-
-# When this file will be removed, clean the description.
-[ -f EXPERIMENTAL ] || exit 1
-
-# 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}.
- exit 1
-fi
-cd ..
-
-%if %{with_zts}
-# duplicate for ZTS build
-cp -pr NTS ZTS
-%endif
-
-# Drop in the bit of configuration
-cat > %{ini_name} << 'EOF'
-; Enable MessagePack extension module
-extension = %{pecl_name}.so
-
-; Configuration options
-
-;msgpack.error_display = On
-;msgpack.illegal_key_insert = Off
-;msgpack.php_only = On
-EOF
-
-
-%build
-cd NTS
-%{_bindir}/phpize
-%configure --with-php-config=%{_bindir}/php-config
-make %{?_smp_mflags}
-
-%if %{with_zts}
-cd ../ZTS
-%{_bindir}/zts-phpize
-%configure --with-php-config=%{_bindir}/zts-php-config
-make %{?_smp_mflags}
-%endif
-
-
-%install
-# Install the NTS stuff
-make -C NTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-%if %{with_zts}
-# Install the ZTS stuff
-make -C ZTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
-# Install the package XML file
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-# Test & Documentation
-cd NTS
-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
-done
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
-
-%check
-# Erratic results
-rm */tests/034.phpt
-# Known by upstream as failed test (travis result)
-rm */tests/041.phpt
-rm */tests/040*.phpt
-
-cd NTS
-: Minimal load test for NTS extension
-%{__php} --no-php-ini \
- --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
- --modules | grep %{pecl_name}
-
-: 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=1 \
-%{__php} -n run-tests.php --show-diff
-
-%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}
-
-: 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=1 \
-%{__ztsphp} -n run-tests.php --show-diff
-%endif
-
-
-%if 0%{?fedora} < 24
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
-%files
-%{?_licensedir:%license NTS/LICENSE}
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
-
-%config(noreplace) %{php_inidir}/%{ini_name}
-%{php_extdir}/%{pecl_name}.so
-
-%if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%{php_ztsextdir}/%{pecl_name}.so
-%endif
-
-
-%files devel
-%doc %{pecl_testdir}/%{pecl_name}
-%{php_incldir}/ext/%{pecl_name}
-
-%if %{with_zts}
-%{php_ztsincldir}/ext/%{pecl_name}
-%endif
-
-
-%changelog
-* Wed Dec 7 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
-- update to 2.0.2
-
-* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-5
-- rebuild with PHP 7.1.0 GA
-
-* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-4
-- rebuild for PHP 7.1 new API version
-
-* Sat Jul 23 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
-- ignore more tests with 7.1
-
-* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
-- add patch for PHP 7.1
- open https://github.com/msgpack/msgpack-php/pull/87
-
-* Tue Mar 1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
-- update to 2.0.1 (php 7, beta)
-- use sources from pecl
-
-* Tue Oct 27 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
-- update to 2.0.0 (php 7, beta)
-
-* Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20151014git75991cf
-- new snapshot, version bump to 2.0.0dev
-
-* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.7.20151002git7a5bdb1
-- rebuild for PHP 7.0.0RC5 new API version
-- new snapshot
-
-* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.6.20150702gitce27a10
-- F23 rebuild with rh_layout
-
-* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.5.20150702gitce27a10
-- rebuild against php 7.0.0beta2
-
-* Wed Jul 8 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.4.20150702gitce27a10
-- new snapshot, rebuild against php 7.0.0beta1
-
-* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.3.20150612git95c8dc3
-- allow build against rh-php56 (as more-php56)
-- rebuild for "rh_layout" (php70)
-
-* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.1.20150612git95c8dc3
-- update to 0.5.7dev for PHP 7
-- sources from github
-
-* Mon Apr 27 2015 Remi Collet <remi@fedoraproject.org> - 0.5.6-1
-- Update to 0.5.6
-- drop runtime dependency on pear, new scriptlets
-
-* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 0.5.5-8.1
-- Fedora 21 SCL mass rebuild
-
-* Sun Aug 24 2014 Remi Collet <remi@fedoraproject.org> - 0.5.5-8
-- improve SCL stuff
-
-* Wed Apr 9 2014 Remi Collet <remi@fedoraproject.org> - 0.5.5-7
-- add numerical prefix to extension configuration file
-
-* Wed Mar 19 2014 Remi Collet <rcollet@redhat.com> - 0.5.5-6
-- allow SCL build
-
-* Fri Feb 28 2014 Remi Collet <remi@fedoraproject.org> - 0.5.5-5
-- cleanups
-- move doc in pecl_docdir
-- move tests in pecl_testdir (devel)
-
-* Thu Jul 18 2013 Remi Collet <remi@fedoraproject.org> - 0.5.5-4
-- bump release
-
-* Thu Apr 18 2013 Remi Collet <remi@fedoraproject.org> - 0.5.5-4
-- ExcludeArch: ppc64 (as msgpack)
-
-* Tue Apr 2 2013 Remi Collet <remi@fedoraproject.org> - 0.5.5-3
-- use system msgpack library headers
-
-* Tue Mar 26 2013 Remi Collet <remi@fedoraproject.org> - 0.5.5-2
-- cleanups
-
-* Wed Feb 20 2013 Remi Collet <remi@fedoraproject.org> - 0.5.5-1
-- Update to 0.5.5
-
-* Fri Nov 30 2012 Remi Collet <remi@fedoraproject.org> - 0.5.3-1.1
-- also provides php-msgpack
-
-* Thu Oct 18 2012 Remi Collet <remi@fedoraproject.org> - 0.5.3-1
-- update to 0.5.3 (beta)
-
-* Sat Sep 15 2012 Remi Collet <remi@fedoraproject.org> - 0.5.2-1
-- initial package, version 0.5.2 (beta)
-
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 620e4d7..5d4bcd1 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -10,22 +10,18 @@
# 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-msgpack
%endif
-%{?scl: %scl_package php-pecl-msgpack}
-
+%global gh_commit b29f3fd572b9d2ad8c053efa6279f93862f63657
+%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner msgpack
+%global gh_project msgpack-php
+#global gh_date 20151014
%global pecl_name msgpack
-%global with_zts 0%{?__ztsphp:1}
-%if "%{php_version}" < "5.6"
-%global ini_name %{pecl_name}.ini
-%else
-%global ini_name 40-%{pecl_name}.ini
-%endif
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
+%global ini_name 40-%{pecl_name}.ini
%if 0
%global with_msgpack 1
@@ -35,15 +31,19 @@
Summary: API for communicating with MessagePack serialization
Name: %{?sub_prefix}php-pecl-msgpack
-Version: 0.5.7
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 2.0.2
+%if 0%{?gh_date:1}
+Release: 0.2.%{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: 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
-Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: %{?scl_prefix}php-devel
+BuildRequires: %{?scl_prefix}php-devel >= 7
BuildRequires: %{?scl_prefix}php-pear
%if %{with_msgpack}
BuildRequires: msgpack-devel
@@ -59,26 +59,25 @@ 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
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
-%if "%{php_version}" > "7.0"
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
@@ -104,7 +103,7 @@ a perfect replacement.
This extension is still EXPERIMENTAL.
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}.
+Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
%package devel
@@ -112,14 +111,25 @@ 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
These are the files needed to compile programs using MessagePack serializer.
%prep
-%setup -q -c
+%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}
@@ -134,8 +144,8 @@ rm -rf msgpack
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_MSGPACK_VERSION/{s/.* "//;s/".*$//;p}' php_msgpack.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 ..
@@ -155,7 +165,6 @@ extension = %{pecl_name}.so
;msgpack.error_display = On
;msgpack.illegal_key_insert = Off
;msgpack.php_only = On
-;msgpack.use_str8_serialization = On
EOF
@@ -174,7 +183,6 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
# Install the NTS stuff
make -C NTS install INSTALL_ROOT=%{buildroot}
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -191,7 +199,8 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
# Test & Documentation
cd NTS
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
for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
@@ -199,8 +208,11 @@ done
%check
+# Erratic results
+rm */tests/034.phpt
# Known by upstream as failed test (travis result)
-rm */tests/{018,030,040,040b,040c,040d}.phpt
+rm */tests/041.phpt
+rm */tests/040*.phpt
cd NTS
: Minimal load test for NTS extension
@@ -251,12 +263,7 @@ fi
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{?_licensedir:%license NTS/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -271,7 +278,6 @@ rm -rf %{buildroot}
%files devel
-%defattr(-,root,root,-)
%doc %{pecl_testdir}/%{pecl_name}
%{php_incldir}/ext/%{pecl_name}
@@ -281,15 +287,52 @@ rm -rf %{buildroot}
%changelog
-* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 0.5.7-2
-- adapt for F24
-- fix license management
+* Wed Dec 7 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
+- update to 2.0.2
+
+* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-5
+- rebuild with PHP 7.1.0 GA
+
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-4
+- rebuild for PHP 7.1 new API version
+
+* Sat Jul 23 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
+- ignore more tests with 7.1
+
+* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
+- add patch for PHP 7.1
+ open https://github.com/msgpack/msgpack-php/pull/87
-* Sun Aug 30 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-1
-- Update to 0.5.7 (beta)
+* Tue Mar 1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
+- update to 2.0.1 (php 7, beta)
+- use sources from pecl
-* Sat Jun 20 2015 Remi Collet <remi@fedoraproject.org> - 0.5.6-2
+* Tue Oct 27 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
+- update to 2.0.0 (php 7, beta)
+
+* Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20151014git75991cf
+- new snapshot, version bump to 2.0.0dev
+
+* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.7.20151002git7a5bdb1
+- rebuild for PHP 7.0.0RC5 new API version
+- new snapshot
+
+* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.6.20150702gitce27a10
+- F23 rebuild with rh_layout
+
+* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.5.20150702gitce27a10
+- rebuild against php 7.0.0beta2
+
+* Wed Jul 8 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.4.20150702gitce27a10
+- new snapshot, rebuild against php 7.0.0beta1
+
+* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.3.20150612git95c8dc3
- allow build against rh-php56 (as more-php56)
+- rebuild for "rh_layout" (php70)
+
+* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.1.20150612git95c8dc3
+- update to 0.5.7dev for PHP 7
+- sources from github
* Mon Apr 27 2015 Remi Collet <remi@fedoraproject.org> - 0.5.6-1
- Update to 0.5.6