diff options
| author | Remi Collet <remi@remirepo.net> | 2021-06-08 07:25:25 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-06-08 07:25:25 +0200 |
| commit | 9a56cdaa9f9e912596499cd74d4eacffcfd23a53 (patch) | |
| tree | ae9e560a205f65e945ba75299faeda69abbf3a62 /php-pecl-pam.spec | |
| parent | 4e7937ba0d9d6725d7513cb9c002b9682d606430 (diff) | |
update to 2.2.2
drop patch merged upstream
Diffstat (limited to 'php-pecl-pam.spec')
| -rw-r--r-- | php-pecl-pam.spec | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/php-pecl-pam.spec b/php-pecl-pam.spec index 4a4a6bc..ed19156 100644 --- a/php-pecl-pam.spec +++ b/php-pecl-pam.spec @@ -23,7 +23,7 @@ %bcond_without tests %endif -%global upstream_version 2.2.1 +%global upstream_version 2.2.2 #global upstream_prever beta1 #global upstream_lower beta1 @@ -36,13 +36,9 @@ URL: https://pecl.php.net/package/PAM Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -# https://github.com/amishmm/php-pam/pull/4 -Patch0: 0001-add-missing-globals-init.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc -# Ignore min from package.xml and allow all supported versions -BuildRequires: %{?scl_prefix}php-devel >= 7.3 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pam-devel @@ -57,8 +53,16 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff +%if "%{php_version}" > "7.4" +Obsoletes: php74-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "8.0" Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.1" +Obsoletes: php81-pecl-%{pecl_name} <= %{version} +%endif +%endif %description @@ -77,8 +81,6 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 -b .pr4 - extver=$(sed -n '/#define PHP_PAM_VERSION/{s/.* "//;s/".*$//;p}' php_pam.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:dev}"; then : Error: Upstream version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:dev}. @@ -196,6 +198,10 @@ fi %endif %changelog +* Tue Jun 8 2021 Remi Collet <remi@remirepo.net> - 2.2.2-1 +- update to 2.2.2 +- drop patch merged upstream + * Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1 - new package - add patch for ZTS build from |