From 6be4de9ca98db0fd222b9fc437debd4ccd1b3ee5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 1 Sep 2021 08:47:58 +0200
Subject: update to 1.11.0beta drop patched merged upstream

---
 php-pecl-amqp.spec | 47 ++++++++++++++++-------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

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

diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec
index 9cdb22b..bda598a 100644
--- a/php-pecl-amqp.spec
+++ b/php-pecl-amqp.spec
@@ -3,7 +3,7 @@
 #
 # Fedora spec file for php-pecl-amqp
 #
-# Copyright (c) 2012-2020 Remi Collet
+# Copyright (c) 2012-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -22,37 +22,27 @@
 
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name   amqp
-%if "%{php_version}" < "5.6"
-%global ini_name    %{pecl_name}.ini
-%else
 %global ini_name    40-%{pecl_name}.ini
-%endif
-#global prever      beta2
+%global upstream_version 1.11.0
+%global upstream_prever  beta
 
 %global buildver %(pkg-config --silence-errors --modversion librabbitmq 2>/dev/null || echo 65536)
 
 Summary:       Communicate with any AMQP compliant server
 Name:          %{?sub_prefix}php-pecl-amqp
-Version:       1.10.2
-Release:       3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       PHP
 URL:           https://pecl.php.net/package/amqp
-Source0:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
-
-Patch0:        https://github.com/php-amqp/php-amqp/commit/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch
-Patch1:        https://patch-diff.githubusercontent.com/raw/php-amqp/php-amqp/pull/383.patch
+Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
+BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 5.6
 BuildRequires: %{?scl_prefix}php-pear
 # Upstream requires 0.7.1, set 0.8.0 to ensure "last" is used.
-%if 0%{?fedora} >= 23 || 0%{?rhel} >= 7
 BuildRequires: librabbitmq-devel   >= 0.8.0
 Requires:      librabbitmq%{?_isa} >= %{buildver}
-%else
-BuildRequires: librabbitmq-last-devel   >= 0.8.0
-Requires:      librabbitmq-last%{?_isa} >= %{buildver}
-%endif
 %if %{with tests}
 BuildRequires: rabbitmq-server
 %endif
@@ -96,12 +86,6 @@ Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
 %endif
 %endif
 
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# filter private shared
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 This extension can communicate with any AMQP spec 0-9-1 compatible server,
@@ -120,18 +104,15 @@ sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 cd NTS
-%patch0 -p1 -b .up
-%patch1 -p1 -b .pr383
-
 sed -e 's/CFLAGS="-I/CFLAGS="-fPIC -I/' -i config.m4
 
 # Upstream often forget to change this
 extver=$(sed -n '/#define PHP_AMQP_VERSION/{s/.* "//;s/".*$//;p}' php_amqp.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream version is ${extver}, expecting %{version}%{?prever}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 cd ..
@@ -235,13 +216,13 @@ done
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
     --define extension=NTS/modules/%{pecl_name}.so \
-    -m | grep %{pecl_name}
+    -m | grep '^%{pecl_name}$'
 
 %if %{with_zts}
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
     --define extension=ZTS/modules/%{pecl_name}.so \
-    -m | grep %{pecl_name}
+    -m | grep '^%{pecl_name}$'
 %endif
 
 %if %{with tests}
@@ -319,6 +300,10 @@ fi
 
 
 %changelog
+* Wed Mar 10 2021 Remi Collet <remi@remirepo.net> - 1.11.0~beta-1
+- update to 1.11.0beta
+- drop patched merged upstream
+
 * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.10.2-3
 - rebuild for PHP 8.0.0RC1
 
-- 
cgit