From b48673f8ed69e32f4dc4e2ffed30a9ebd31a357a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jun 2018 12:21:17 +0200 Subject: cleanup --- PHPINFO | 24 ++++++++++++++++++++++++ REFLECTION | 2 +- php-pecl-molten.spec | 14 +++++++++----- 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 PHPINFO diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..489a6f7 --- /dev/null +++ b/PHPINFO @@ -0,0 +1,24 @@ + +molten + +molten support => enabled +plugin support => pdo mysqli phpredis memcahced curl mongodb guzzle elasticsearch + +Directive => Local Value => Master Value +molten.enable => 1 => 1 +molten.sink_log_path => /tmp/tracing => /tmp/tracing +molten.service_name => default => default +molten.tracing_cli => 0 => 0 +molten.sampling_type => 1 => 1 +molten.sampling_request => 1000 => 1000 +molten.sampling_rate => 64 => 64 +molten.span_format => zipkin => zipkin +molten.report_interval => 60 => 60 +molten.notify_uri => no value => no value +molten.report_limit => 100 => 100 +molten.sink_type => 1 => 1 +molten.output_type => 1 => 1 +molten.sink_http_uri => no value => no value +molten.sink_syslog_unix_socket => no value => no value +molten.sink_kafka_brokers => no value => no value +molten.sink_kafka_topic => no value => no value diff --git a/REFLECTION b/REFLECTION index d10c1f4..9d2cb15 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #18 molten version 0.1.2beta ] { +Extension [ extension #195 molten version 0.1.2beta ] { - Dependencies { Dependency [ json (Required) ] diff --git a/php-pecl-molten.spec b/php-pecl-molten.spec index 7e355e6..57d7ee6 100644 --- a/php-pecl-molten.spec +++ b/php-pecl-molten.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-molten # -# Copyright (c) 2017 Remi Collet +# Copyright (c) 2017-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -28,18 +28,19 @@ Summary: Extension for application tracing Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: ASL 2.0 Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 5.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-pecl-memcached -BuildRequires: %{?scl_prefix}php-pecl-redis +BuildRequires: %{?scl_prefix}php-pecl(redis) BuildRequires: %{?scl_prefix}php-pecl-mongodb BuildRequires: %{?scl_prefix}php-mysqlnd BuildRequires: %{?scl_prefix}php-pdo @@ -53,7 +54,7 @@ Requires: %{?scl_prefix}php-curl%{?_isa} Requires: %{?scl_prefix}php-mysqlnd%{?_isa} Requires: %{?scl_prefix}php-pdo%{?_isa} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -%if 0%{?fedora} +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: %{?scl_prefix}php-pecl-memcached%{?_isa} Suggests: %{?scl_prefix}php-pecl-redis%{?_isa} Suggests: %{?scl_prefix}php-pecl-mongodb%{?_isa} @@ -209,7 +210,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{proj_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 @@ -295,6 +296,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Jun 28 2018 Remi Collet - 0.1.2~beta-3 +- cleanup + * Thu Aug 24 2017 Remi Collet - 0.1.2~beta-2 - License is ASL 2.0 - make dependency on mongodb, redis and memcached optional -- cgit