diff options
| author | Remi Collet <remi@remirepo.net> | 2020-10-06 09:34:40 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-10-06 09:34:40 +0200 |
| commit | 4316e3e952caa03bf5aa901f0e24b23c3059d095 (patch) | |
| tree | 61e802fb8c4946355a1fa9eae8af22e572d18880 /php-pecl-scrypt.spec | |
| parent | 3fa9618e426d97f0607dd466ab6aabdad7bdee15 (diff) | |
add patch for PHP 8 from
https://github.com/DomBlack/php-scrypt/pull/56
Diffstat (limited to 'php-pecl-scrypt.spec')
| -rw-r--r-- | php-pecl-scrypt.spec | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/php-pecl-scrypt.spec b/php-pecl-scrypt.spec index 6be5b38..e0bc2f2 100644 --- a/php-pecl-scrypt.spec +++ b/php-pecl-scrypt.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-scrypt # -# Copyright (c) 2013-2019 Remi Collet +# Copyright (c) 2013-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -22,11 +22,13 @@ Summary: Scrypt hashing function Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.4.2 -Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages -URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +URL: https://pecl.php.net/package/%{pecl_name} +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz + +Patch0: https://patch-diff.githubusercontent.com/raw/DomBlack/php-scrypt/pull/56.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.3 @@ -46,39 +48,16 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{rele Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "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} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "8.0" +Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif %endif @@ -105,6 +84,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr # Sanity check, really often broken extver=$(sed -n '/#define PHP_SCRYPT_VERSION/{s/.* "//;s/".*$//;p}' php_scrypt.h) @@ -237,6 +217,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Oct 6 2020 Remi Collet <remi@remirepo.net> - 1.4.2-9 +- add patch for PHP 8 from + https://github.com/DomBlack/php-scrypt/pull/56 + * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.4.2-8 - rebuild for 7.4.0RC1 |