diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 168 | ||||
| -rw-r--r-- | php-pecl-cassandra.spec | 84 |
3 files changed, 164 insertions, 90 deletions
@@ -2,7 +2,7 @@ cassandra Cassandra support => enabled -C/C++ driver version => 2.16.2 +C/C++ driver version => 2.17.0 PHP driver extension => customized for persistent prepared statements Persistent Clusters => 0 Persistent Sessions => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { +Extension [ <persistent> extension #73 cassandra version 1.3.2 ] { - Dependencies { Dependency [ spl (Required) ] @@ -46,8 +46,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -64,6 +64,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -137,8 +138,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -155,6 +156,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -228,8 +230,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -246,6 +248,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -319,8 +322,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -337,6 +340,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -410,8 +414,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -428,6 +432,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -501,8 +506,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -519,6 +524,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -592,8 +598,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -610,6 +616,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -683,8 +690,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -701,6 +708,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -774,8 +782,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -792,6 +800,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -865,8 +874,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -883,6 +892,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -956,8 +966,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -974,6 +984,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1047,8 +1058,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1065,6 +1076,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1138,8 +1150,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1156,6 +1168,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1229,8 +1242,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1247,6 +1260,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1320,8 +1334,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1338,6 +1352,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1411,8 +1426,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1429,6 +1444,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1502,8 +1518,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1520,6 +1536,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1593,8 +1610,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1611,6 +1628,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1684,8 +1702,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1702,6 +1720,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1775,8 +1794,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1793,6 +1812,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1866,8 +1886,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1884,6 +1904,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -1957,8 +1978,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -1975,6 +1996,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -2048,8 +2070,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -2066,6 +2088,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -2139,8 +2162,8 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Properties [4] { Property [ protected $message = '' ] Property [ protected $code = 0 ] - Property [ protected $file = NULL ] - Property [ protected $line = NULL ] + Property [ protected string $file = '' ] + Property [ protected int $line = 0 ] } - Methods [10] { @@ -2157,6 +2180,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { @@ -3569,36 +3593,42 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ int ] } Method [ <internal:cassandra, prototype Iterator> public method current ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method key ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method next ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype Iterator> public method valid ] { - Parameters [0] { } + - Tentative return [ bool ] } Method [ <internal:cassandra, prototype Iterator> public method rewind ] { - Parameters [0] { } + - Tentative return [ void ] } } } @@ -3677,36 +3707,42 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ int ] } Method [ <internal:cassandra, prototype Iterator> public method current ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method key ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method next ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype Iterator> public method valid ] { - Parameters [0] { } + - Tentative return [ bool ] } Method [ <internal:cassandra, prototype Iterator> public method rewind ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetSet ] { @@ -3715,6 +3751,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { Parameter #0 [ <required> $offset ] Parameter #1 [ <required> $value ] } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetGet ] { @@ -3722,6 +3759,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [1] { Parameter #0 [ <required> $offset ] } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetUnset ] { @@ -3729,6 +3767,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [1] { Parameter #0 [ <required> $offset ] } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetExists ] { @@ -3736,6 +3775,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [1] { Parameter #0 [ <required> $offset ] } + - Tentative return [ bool ] } } } @@ -3799,36 +3839,42 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ int ] } Method [ <internal:cassandra, prototype Iterator> public method current ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method key ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method next ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype Iterator> public method valid ] { - Parameters [0] { } + - Tentative return [ bool ] } Method [ <internal:cassandra, prototype Iterator> public method rewind ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra> public method remove ] { @@ -3893,36 +3939,42 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ int ] } Method [ <internal:cassandra, prototype Iterator> public method current ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method key ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method next ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype Iterator> public method valid ] { - Parameters [0] { } + - Tentative return [ bool ] } Method [ <internal:cassandra, prototype Iterator> public method rewind ] { - Parameters [0] { } + - Tentative return [ void ] } } } @@ -3980,36 +4032,42 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ int ] } Method [ <internal:cassandra, prototype Iterator> public method current ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method key ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method next ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype Iterator> public method valid ] { - Parameters [0] { } + - Tentative return [ bool ] } Method [ <internal:cassandra, prototype Iterator> public method rewind ] { - Parameters [0] { } + - Tentative return [ void ] } } } @@ -4060,7 +4118,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { Constant [ public string TYPE_TIMEUUID ] { timeuuid } Constant [ public string TYPE_INET ] { inet } Constant [ public string VERSION ] { 1.3.2 } - Constant [ public string CPP_DRIVER_VERSION ] { 2.16.2 } + Constant [ public string CPP_DRIVER_VERSION ] { 2.17.0 } } - Static properties [0] { @@ -4901,36 +4959,42 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [0] { } + - Tentative return [ int ] } Method [ <internal:cassandra, prototype Iterator> public method rewind ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype Iterator> public method current ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method key ] { - Parameters [0] { } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype Iterator> public method next ] { - Parameters [0] { } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype Iterator> public method valid ] { - Parameters [0] { } + - Tentative return [ bool ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetExists ] { @@ -4938,6 +5002,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [1] { Parameter #0 [ <required> $offset ] } + - Tentative return [ bool ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetGet ] { @@ -4945,6 +5010,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [1] { Parameter #0 [ <required> $offset ] } + - Tentative return [ mixed ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetSet ] { @@ -4953,6 +5019,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { Parameter #0 [ <required> $offset ] Parameter #1 [ <required> $value ] } + - Tentative return [ void ] } Method [ <internal:cassandra, prototype ArrayAccess> public method offsetUnset ] { @@ -4960,6 +5027,7 @@ Extension [ <persistent> extension #72 cassandra version 1.3.2 ] { - Parameters [1] { Parameter #0 [ <required> $offset ] } + - Tentative return [ void ] } Method [ <internal:cassandra> public method isLastPage ] { diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec index 35edb5d..9bb9134 100644 --- a/php-pecl-cassandra.spec +++ b/php-pecl-cassandra.spec @@ -7,11 +7,9 @@ # Please preserve changelog entries # -%if 0%{?scl:1} -%scl_package php-pecl-cassandra -%endif +%{?scl:%scl_package php-pecl-cassandra} -%bcond_without tests +%bcond_without tests %global pecl_name cassandra %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} @@ -22,6 +20,12 @@ %global gh_owner datastax %global gh_project php-driver %global ini_name 40-%{pecl_name}.ini +%if 0%{?gh_commit:1} +%global sources %{gh_project}-%{gh_commit}/ext +%else +%global sources %{pecl_name}-%{version}%{?prever} +%endif +%global _configure ../%{sources}/configure # We don't really rely on upstream ABI %global buildver %(pkg-config --silence-errors --modversion cassandra 2>/dev/null || echo 65536) @@ -29,7 +33,7 @@ Summary: DataStax PHP Driver for Apache Cassandra Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.3.2 -Release: 12%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 13%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} @@ -60,7 +64,6 @@ BuildRequires: gmp-devel Requires: cassandra-cpp-driver%{?_isa} >= %{buildver} 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} @@ -79,10 +82,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -c -q %if 0%{?gh_commit:1} -mv %{gh_project}-%{gh_commit}/ext NTS -mv NTS/package.xml . -%else -mv %{pecl_name}-%{version}%{?prever} NTS +mv %{sources}/package.xml . %endif # Don't install/register tests @@ -90,14 +90,14 @@ sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml -cd NTS -%patch0 -p2 -b .pr126 -%patch1 -p2 -b .pr132 -%patch2 -p2 -b .pr135 -%patch3 -p2 -b .pr141 -%patch4 -p2 -b .php8 -%patch5 -p2 -b .php81 -%patch6 -p2 -b .php82 +pushd %{sources} +%patch -P0 -p2 -b .pr126 +%patch -P1 -p2 -b .pr132 +%patch -P2 -p2 -b .pr135 +%patch -P3 -p2 -b .pr141 +%patch -P4 -p2 -b .php8 +%patch -P5 -p2 -b .php81 +%patch -P6 -p2 -b .php82 # Sanity check, really often broken extver=$(sed -n '/#define PHP_DRIVER_VERSION /{s/.* "//;s/".*$//;p}' version.h) @@ -105,7 +105,7 @@ if test "x${extver}" != "x%{version}%{?prever}"; then : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}. exit 1 fi -cd .. +popd cat << 'EOF' | tee %{ini_name} ; Enable '%{summary}' extension module @@ -116,8 +116,9 @@ extension=%{pecl_name}.so ;cassandra.log_level = 'ERROR' EOF +mkdir NTS %if %{with_zts} -cp -pr NTS ZTS +mkdir ZTS %endif @@ -126,20 +127,24 @@ cp -pr NTS ZTS export PHP_RPATH=no -cd NTS -%{_bindir}/phpize +pushd %{sources} +%{__phpize} +popd + +pushd NTS %configure \ --with-cassandra \ - --with-php-config=%{_bindir}/php-config + --with-php-config=%{__phpconfig} make %{?_smp_mflags} +popd %if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize +pushd ZTS %configure \ --with-cassandra \ - --with-php-config=%{_bindir}/zts-php-config + --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} +popd %endif @@ -161,7 +166,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -186,41 +191,39 @@ fi %check +cd %{sources} + : Minimal load test for NTS extension %{__php} -n \ -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - -m | grep %{pecl_name} + -m | grep '^%{pecl_name}$' %if %{with tests} -cd NTS : Upstream test suite NTS extension TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff +%{__php} -n run-tests.php -q --show-diff %endif %if %{with_zts} : Minimal load test for ZTS extension %{__ztsphp} -n \ -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - -m | grep %{pecl_name} + -m | grep '^%{pecl_name}$' %if %{with tests} -cd ../ZTS : Upstream test suite ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff +%{__ztsphp} -n run-tests.php -q --show-diff %endif %endif %files -%{?_licensedir:%license NTS/LICENSE} +%{?_licensedir:%license %{sources}/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -234,7 +237,10 @@ REPORT_EXIT_STATUS=1 \ %changelog -* Tue Feb 20 2023 Remi Collet <remi@remirepo.net> - 1.3.2-12 +* Fri Aug 18 2023 Remi Collet <remi@remirepo.net> - 1.3.2-13 +- build out of sources tree + +* Tue Feb 21 2023 Remi Collet <remi@remirepo.net> - 1.3.2-12 - spec cleanup, synced with fork version 1.3.8 * Fri Sep 16 2022 Remi Collet <remi@remirepo.net> - 1.3.2-11 |