diff options
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-snappy.spec | 41 |
3 files changed, 20 insertions, 27 deletions
@@ -2,6 +2,6 @@ snappy Snappy support => enabled -Extension Version => 0.2.0 -Snappy Version => 1.1.8 +Extension Version => 0.2.1 +Snappy Version => system library Snappy APCu serializer ABI => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #100 snappy version 0.2.0 ] { +Extension [ <persistent> extension #102 snappy version 0.2.1 ] { - Dependencies { Dependency [ apcu (Optional) ] diff --git a/php-snappy.spec b/php-snappy.spec index 98c888f..10322f8 100644 --- a/php-snappy.spec +++ b/php-snappy.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-snappy # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -16,13 +16,13 @@ # To build with PHP 5.x use --without apcu %bcond_without apcu -%if 0%{?fedora} >= 32 -%global with_libsnappy 1 +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 +%bcond_without libsnappy %else -%global with_libsnappy 0 +%bcond_with libsnappy %endif -%global gh_commit e42cc15bb38140eae95a295a105ddcbf391dcb7c +%global gh_commit 8b0feaf75a7e0ea05495172369a94caf7f672f73 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner kjdev %global gh_project php-ext-snappy @@ -32,11 +32,6 @@ %global ini_name 40-%{pecl_name}.ini %if ! 0%{?dtsversion} -%if 0%{?rhel} == 6 -%global dtsenable export PHP_AUTOCONF=autoconf268;export PHP_AUTOHEADER=autoheader268;source /opt/rh/devtoolset-7/enable -BuildRequires: devtoolset-7-toolchain -BuildRequires: autoconf268 -%endif %if 0%{?rhel} == 7 %global dtsenable source /opt/rh/devtoolset-7/enable BuildRequires: devtoolset-7-toolchain @@ -45,13 +40,13 @@ BuildRequires: devtoolset-7-toolchain Summary: Snappy Extension for PHP Name: %{?sub_prefix}php-snappy -Version: 0.2.0 +Version: 0.2.1 %if 0%{?gh_date:1} Release: 2%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 2%{?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 -%if %{?with_libsnappy} +%if %{with libsnappy} License: PHP %else License: PHP and BSD @@ -61,13 +56,14 @@ Source0: %{pkg_name}-%{version}-%{gh_short}.tgz # retrieve a recursive git snapshot with submodule Source1: makesrc.sh +BuildRequires: make %if %{with apcu} BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pecl-apcu-devel %else BuildRequires: %{?scl_prefix}php-devel %endif -%if %{?with_libsnappy} +%if %{with libsnappy} BuildRequires: snappy-devel %else Provides: bundled(snappy) = 1.1.8 @@ -89,12 +85,6 @@ Obsoletes: php80-%{pecl_name} <= %{version} %endif %endif -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - %description This extension allows Snappy, a compression/decompression library. @@ -107,7 +97,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{gh_project}-%{gh_commit} NTS cd NTS -%if %{?with_libsnappy} +%if %{with libsnappy} # Use the system library rm -r snappy %else @@ -142,7 +132,7 @@ cd NTS %{_bindir}/phpize %configure \ --with-php-config=%{_bindir}/php-config \ -%if %{?with_libsnappy} +%if %{with libsnappy} --with-snappy-includedir=/usr \ %endif --with-libdir=%{_lib} \ @@ -154,7 +144,7 @@ cd ../ZTS %{_bindir}/zts-phpize %configure \ --with-php-config=%{_bindir}/zts-php-config \ -%if %{?with_libsnappy} +%if %{with libsnappy} --with-snappy-includedir=/usr \ %endif --with-libdir=%{_lib} \ @@ -221,7 +211,7 @@ REPORT_EXIT_STATUS=1 \ %files %{!?_licensedir:%global license %%doc} %license NTS/LICENSE -%if ! %{?with_libsnappy} +%if ! %{with libsnappy} %license NTS/COPYING.snappy %endif %doc NTS/CREDITS @@ -237,6 +227,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Jan 15 2021 Remi Collet <remi@remirepo.net> - 0.2.1-1 +- update to 0.2.0 + * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 0.2.0-2 - rebuild for PHP 8.0.0RC1 |