From 1fadf9b8119b887c04736de102302bb9f3dbb01b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Jul 2018 12:06:04 +0200 Subject: update to 0.15.0-dev for PHP 7.3 --- PHPINFO | 16 ++++++++++++++++ php-pecl-vld.spec | 55 ++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 PHPINFO diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..fab86af --- /dev/null +++ b/PHPINFO @@ -0,0 +1,16 @@ + +vld + +vld support => enabled + +Directive => Local Value => Master Value +vld.active => 0 => 0 +vld.skip_prepend => 0 => 0 +vld.skip_append => 0 => 0 +vld.execute => 1 => 1 +vld.verbosity => 1 => 1 +vld.format => 0 => 0 +vld.col_sep => => +vld.save_dir => /tmp => /tmp +vld.save_paths => 0 => 0 +vld.dump_paths => 1 => 1 diff --git a/php-pecl-vld.spec b/php-pecl-vld.spec index b86085b..d91d149 100644 --- a/php-pecl-vld.spec +++ b/php-pecl-vld.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-vld # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,6 +11,11 @@ %scl_package php-pecl-vld %endif +%global gh_commit 1719df5500f3f5fd13c88b1d6c8838e78b54d132 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner derickr +%global gh_project vld +%global gh_date 20180514 %global pecl_name vld %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %if "%{php_version}" < "5.6" @@ -21,14 +26,19 @@ Summary: Dump the internal representation of PHP scripts Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 0.14.0 +Version: 0.15.0 +%if 0%{?gh_date:1} +Release: 0.11.%{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 Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +%endif License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -47,14 +57,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} @@ -89,7 +91,18 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c +%if 0%{?gh_date:1} +mv %{gh_project}-%{gh_commit} NTS +%{__php} -r ' + $pkg = simplexml_load_file("NTS/package.xml"); + $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2); + $pkg->version->release = "%{version}dev"; + $pkg->stability->release = "devel"; + $pkg->asXML("package.xml"); +' +%else mv %{pecl_name}-%{version} NTS +%endif %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} @@ -97,8 +110,8 @@ mv %{pecl_name}-%{version} NTS sed -e 's/"0.14.0-dev"/"%{version}"/' -i NTS/vld.c : Check version -if ! grep -q '"%{version}"' NTS/vld.c; then - : Error: Upstream extension version, expecting %{version}%{?prever:-%{prever}}. +if ! grep -q '"%{version}%{?gh_date:-dev}"' NTS/vld.c; then + : Error: Upstream extension version, expecting %{version}%{?gh_date:-dev}%{?prever:-%{prever}}. exit 1 fi @@ -127,6 +140,8 @@ EOF %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure \ @@ -143,7 +158,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -167,7 +182,7 @@ done %{!?_licensedir:install -Dpm 644 LICENSE %{buildroot}%{pecl_docdir}/%{pecl_name}/LICENSE} -%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 @@ -201,12 +216,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -221,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Mon Jul 2 2018 Remi Collet - 0.15.0-0.11.20180514.1719df5 +- update to 0.15.0-dev for PHP 7.3 + * Tue Jul 18 2017 Remi Collet - 0.14.0-2 - rebuild for PHP 7.2.0beta1 new API -- cgit