summaryrefslogtreecommitdiffstats
path: root/php-pinba.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-08-02 07:58:57 +0200
committerRemi Collet <remi@remirepo.net>2020-08-02 07:58:57 +0200
commit220c72bc19d8c2d323695d71a9ae98839ef2d9cb (patch)
tree933ceea0896eaa6df99141aadc5cfff99f347123 /php-pinba.spec
parent23e455394397268d499ad19e62d78905d7c7261e (diff)
update to 1.1.2HEADmaster
Diffstat (limited to 'php-pinba.spec')
-rw-r--r--php-pinba.spec26
1 files changed, 10 insertions, 16 deletions
diff --git a/php-pinba.spec b/php-pinba.spec
index cf88bfd..fdeec54 100644
--- a/php-pinba.spec
+++ b/php-pinba.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pinba
#
-# Copyright (c) 2017-2019 Remi Collet
+# Copyright (c) 2017-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -12,7 +12,7 @@
%{?scl: %scl_package php-pinba}
-%global gh_commit 225262582ed3fb6e8de6eb5ec5a8c666716385dc
+%global gh_commit 98c01fb5cde068426aae61d239205db75c507cbf
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner tony2001
%global gh_project pinba_extension
@@ -22,18 +22,16 @@
Summary: Client extension for Pinba statistics server
Name: %{?scl_prefix}php-pinba
-Version: 1.1.1
+Version: 1.1.2
%if 0%{?gh_date:1}
-Release: 0.7.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%else
-Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%endif
License: LGPLv2+
URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
-Patch0: https://github.com/tony2001/pinba_extension/commit/edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e.patch
-
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 7
BuildRequires: %{?scl_prefix}php-tokenizer
@@ -42,13 +40,7 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-Obsoletes: php70u-%{pecl_name} <= %{version}
-Obsoletes: php70w-%{pecl_name} <= %{version}
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-%{pecl_name} <= %{version}
-Obsoletes: php71w-%{pecl_name} <= %{version}
-%endif
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
%if "%{php_version}" > "7.2"
Obsoletes: php72u-%{pecl_name} <= %{version}
Obsoletes: php72w-%{pecl_name} <= %{version}
@@ -81,8 +73,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
mv %{gh_project}-%{gh_commit} NTS
cd NTS
-%patch0 -p1 -b .up
-
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_PINBA_VERSION/{s/.* "//;s/".*$//;p}' php_pinba.h)
if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
@@ -103,6 +93,7 @@ extension = %{pecl_name}.so
; Configuration
;pinba.server = ''
+;pinba.resolve_interval = 60
;pinba.enabled = 0
;pinba.auto_flush = 1
EOF
@@ -188,6 +179,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Sun Aug 2 2020 Remi Collet <remi@remirepo.net> - 1.1.2-1
+- update to 1.1.2
+
* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.1.1-6
- rebuild for 7.4.0RC1