From bd043705ce060d471f1ec867f15e230e1b128ce0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Mar 2018 07:36:54 +0100 Subject: Update to 0.2.1 (beta) raise dependency on PHP 7 --- REFLECTION | 109 +++++++++++++++++++++++++------------------------- php-pecl-leveldb.spec | 50 ++++++++++++----------- 2 files changed, 80 insertions(+), 79 deletions(-) diff --git a/REFLECTION b/REFLECTION index efb09f2..4398a1a 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #191 leveldb version 0.1.5 ] { +Extension [ extension #192 leveldb version 0.2.1 ] { - Constants [2] { Constant [ integer LEVELDB_NO_COMPRESSION ] { 0 } @@ -18,16 +18,16 @@ Extension [ extension #191 leveldb version 0.1.5 ] { Method [ static public method destroy ] { - Parameters [2] { - Parameter #0 [ $name ] - Parameter #1 [ $options ] + Parameter #0 [ string $name ] + Parameter #1 [ array $options ] } } Method [ static public method repair ] { - Parameters [2] { - Parameter #0 [ $name ] - Parameter #1 [ $options ] + Parameter #0 [ string $name ] + Parameter #1 [ array $options ] } } } @@ -39,75 +39,75 @@ Extension [ extension #191 leveldb version 0.1.5 ] { Method [ public method __construct ] { - Parameters [4] { - Parameter #0 [ $name ] - Parameter #1 [ $options ] - Parameter #2 [ $read_options ] - Parameter #3 [ $write_options ] + Parameter #0 [ string $name ] + Parameter #1 [ array $options ] + Parameter #2 [ array $read_options ] + Parameter #3 [ array $write_options ] } } Method [ public method get ] { - Parameters [2] { - Parameter #0 [ $key ] - Parameter #1 [ $read_options ] + Parameter #0 [ string $key ] + Parameter #1 [ array $read_options ] } } Method [ public method set ] { - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $write_options ] + Parameter #0 [ string $key ] + Parameter #1 [ string $value ] + Parameter #2 [ array $write_options ] } } Method [ public method put ] { - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $write_options ] + Parameter #0 [ string $key ] + Parameter #1 [ string $value ] + Parameter #2 [ array $write_options ] } } Method [ public method delete ] { - Parameters [2] { - Parameter #0 [ $key ] - Parameter #1 [ $write_options ] + Parameter #0 [ string $key ] + Parameter #1 [ array $write_options ] } } Method [ public method write ] { - Parameters [2] { - Parameter #0 [ $batch ] - Parameter #1 [ $write_options ] + Parameter #0 [ LevelDBWriteBatch $batch ] + Parameter #1 [ array $write_options ] } } Method [ public method getProperty ] { - Parameters [1] { - Parameter #0 [ $name ] + Parameter #0 [ string $name ] } } Method [ public method getApproximateSizes ] { - Parameters [2] { - Parameter #0 [ $start ] - Parameter #1 [ $limit ] + Parameter #0 [ array $start ] + Parameter #1 [ array $limit ] } } Method [ public method compactRange ] { - Parameters [2] { - Parameter #0 [ $start ] - Parameter #1 [ $limit ] + Parameter #0 [ string $start ] + Parameter #1 [ string $limit ] } } @@ -120,7 +120,7 @@ Extension [ extension #191 leveldb version 0.1.5 ] { Method [ public method getIterator ] { - Parameters [1] { - Parameter #0 [ $options ] + Parameter #0 [ array $options ] } } @@ -149,37 +149,33 @@ Extension [ extension #191 leveldb version 0.1.5 ] { - Methods [5] { Method [ public method __construct ] { - - Parameters [4] { - Parameter #0 [ $name ] - Parameter #1 [ $options ] - Parameter #2 [ $read_options ] - Parameter #3 [ $write_options ] + - Parameters [0] { } } Method [ public method set ] { - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $write_options ] + Parameter #0 [ string $key ] + Parameter #1 [ string $value ] + Parameter #2 [ array $write_options ] } } Method [ public method put ] { - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $write_options ] + Parameter #0 [ string $key ] + Parameter #1 [ string $value ] + Parameter #2 [ array $write_options ] } } Method [ public method delete ] { - Parameters [2] { - Parameter #0 [ $key ] - Parameter #1 [ $write_options ] + Parameter #0 [ string $key ] + Parameter #1 [ array $write_options ] } } @@ -209,8 +205,8 @@ Extension [ extension #191 leveldb version 0.1.5 ] { Method [ public method __construct ] { - Parameters [2] { - Parameter #0 [ $db ] - Parameter #1 [ $read_options ] + Parameter #0 [ LevelDB $db ] + Parameter #1 [ array $read_options ] } } @@ -235,7 +231,7 @@ Extension [ extension #191 leveldb version 0.1.5 ] { Method [ public method seek ] { - Parameters [1] { - Parameter #0 [ $key ] + Parameter #0 [ string $key ] } } @@ -295,7 +291,7 @@ Extension [ extension #191 leveldb version 0.1.5 ] { Method [ public method __construct ] { - Parameters [1] { - Parameter #0 [ $db ] + Parameter #0 [ LevelDB $db ] } } @@ -307,7 +303,7 @@ Extension [ extension #191 leveldb version 0.1.5 ] { } } - Class [ class LevelDBException extends Exception ] { + Class [ class LevelDBException extends Exception implements Throwable ] { - Constants [0] { } @@ -325,8 +321,8 @@ Extension [ extension #191 leveldb version 0.1.5 ] { Property [ protected $line ] } - - Methods [9] { - Method [ method __construct ] { + - Methods [10] { + Method [ public method __construct ] { - Parameters [3] { Parameter #0 [ $message ] @@ -335,28 +331,31 @@ Extension [ extension #191 leveldb version 0.1.5 ] { } } - Method [ final public method getMessage ] { + Method [ public method __wakeup ] { + } + + Method [ final public method getMessage ] { } - Method [ final public method getCode ] { + Method [ final public method getCode ] { } - Method [ final public method getFile ] { + Method [ final public method getFile ] { } - Method [ final public method getLine ] { + Method [ final public method getLine ] { } - Method [ final public method getTrace ] { + Method [ final public method getTrace ] { } - Method [ final public method getPrevious ] { + Method [ final public method getPrevious ] { } - Method [ final public method getTraceAsString ] { + Method [ final public method getTraceAsString ] { } - Method [ public method __toString ] { + Method [ public method __toString ] { } } } diff --git a/php-pecl-leveldb.spec b/php-pecl-leveldb.spec index d37c948..d125708 100644 --- a/php-pecl-leveldb.spec +++ b/php-pecl-leveldb.spec @@ -1,29 +1,30 @@ # remirepo spec file for php-pecl-leveldb # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # + +# we don't want -z defs linker flag +%undefine _strict_symbol_defs_build + %{?scl: %scl_package php-pecl-ssdeep} -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name leveldb Summary: LevelDB PHP bindings Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 0.1.5 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 0.2.1 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD -Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# See : leveldb bug (assert enabeld in prod) -# https://bugzilla.redhat.com/show_bug.cgi?id=1000777 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: leveldb-devel @@ -40,14 +41,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %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} @@ -56,6 +49,14 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} %endif +%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 %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -103,6 +104,8 @@ EOF %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure \ @@ -121,7 +124,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -142,7 +145,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$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 @@ -192,12 +195,7 @@ REPORT_EXIT_STATUS=0 \ %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -212,6 +210,10 @@ rm -rf %{buildroot} %changelog +* Tue Mar 6 2018 Remi Collet - 0.2.1-1 +- Update to 0.2.1 (beta) +- raise dependency on PHP 7 + * Tue Mar 8 2016 Remi Collet - 0.1.5-2 - adapt for F24 -- cgit