From 94940494437671ad02a88e3b7074406700f680b1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sun, 30 Jul 2023 09:44:40 +0200
Subject: update to 2.0.0alpha1

drop patch merged upstream
raise dependency on PHP 7.4
open https://github.com/php-amqp/php-amqp/issues/439 librabbitmq min version
---
 php-pecl-amqp.spec | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'php-pecl-amqp.spec')

diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec
index 2d8a915..af30aeb 100644
--- a/php-pecl-amqp.spec
+++ b/php-pecl-amqp.spec
@@ -17,9 +17,9 @@
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name   amqp
 %global ini_name    40-%{pecl_name}.ini
-%global upstream_version 1.11.0
-#global upstream_prever  RC1
-#global upstream_lower   rc1
+%global upstream_version 2.0.0
+%global upstream_prever  alpha1
+%global upstream_lower   %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]')
 %global sources     %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure  ../%{sources}/configure
 
@@ -28,19 +28,16 @@
 Summary:       Communicate with any AMQP compliant server
 Name:          %{?scl_prefix}php-pecl-amqp
 Version:       %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:       3%{?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;')}}
 License:       PHP-3.01
 URL:           https://pecl.php.net/package/amqp
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-Patch0:        https://patch-diff.githubusercontent.com/raw/php-amqp/php-amqp/pull/418.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel >= 5.6
+BuildRequires: %{?scl_prefix}php-devel >= 7.4
 BuildRequires: %{?scl_prefix}php-pear
-# Upstream requires 0.7.1, set 0.8.0 to ensure "last" is used.
-BuildRequires: librabbitmq-devel   >= 0.8.0
+BuildRequires: librabbitmq-devel
 Requires:      librabbitmq%{?_isa} >= %{buildver}
 %if %{with tests}
 BuildRequires: rabbitmq-server
@@ -48,7 +45,6 @@ BuildRequires: rabbitmq-server
 
 Requires:         %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:         %{?scl_prefix}php(api) = %{php_core_api}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:         %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:         %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
@@ -97,12 +93,12 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd %{sources}
-%patch -P0 -p1 -b .php82
-
-sed -e 's/CFLAGS="-I/CFLAGS="-fPIC -I/' -i config.m4
+# lower minimal version
+# https://github.com/php-amqp/php-amqp/issues/439
+sed -e '/librabbitmq/s/0.10.0/0.8.0/' -i config.m4
 
 # Upstream often forget to change this
-extver=$(sed -n '/#define PHP_AMQP_VERSION/{s/.* "//;s/".*$//;p}' php_amqp.h)
+extver=$(sed -n '/#define PHP_AMQP_VERSION /{s/.* "//;s/".*$//;p}' php_amqp_version.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
    : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
@@ -156,8 +152,8 @@ extension = %{pecl_name}.so
 ;amqp.cacert = ''
 ;amqp.cert = ''
 ;amqp.key = ''
-;amqp.verify = ''
-;amqp.sasl_method = 0
+;amqp.verify = 1
+;amqp.sasl_method = ''
 EOF
 
 mkdir NTS
@@ -282,6 +278,12 @@ fi
 
 
 %changelog
+* Sun Jul 30 2023 Remi Collet <remi@remirepo.net> - 2.0.0~alpha1-1
+- update to 2.0.0alpha1
+- drop patch merged upstream
+- raise dependency on PHP 7.4
+- open https://github.com/php-amqp/php-amqp/issues/439 librabbitmq min version
+
 * Wed Jul 12 2023 Remi Collet <remi@remirepo.net> - 1.11.0-3
 - build out of sources tree
 
-- 
cgit