From da0d27d0caaf40400e0abbedcebe0dc0ba64fcd3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 24 Aug 2020 07:06:42 +0200
Subject: update to 2.4.0 drop patch merged upstream raise dependency on PHP
 7.4

---
 php-pecl-sdl.spec | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

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

diff --git a/php-pecl-sdl.spec b/php-pecl-sdl.spec
index 2a9eadc..de47a33 100644
--- a/php-pecl-sdl.spec
+++ b/php-pecl-sdl.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-sdl
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -14,14 +14,14 @@
 
 Summary:       Simple DirectMedia Layer for PHP
 Name:          %{?scl_prefix}php-pecl-sdl
-Version:       2.3.0
+Version:       2.4.0
 Release:       1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:       PHP
 Group:         Development/Languages
-URL:           http://pecl.php.net/package/sdl
-Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+URL:           https://pecl.php.net/package/sdl
+Source0:       https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-BuildRequires: %{?scl_prefix}php-devel >= 7.3
+BuildRequires: %{?scl_prefix}php-devel >= 7.4
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: SDL2-devel
 
@@ -40,7 +40,7 @@ Provides:      %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
 %if "%{php_version}" > "7.2"
 Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
@@ -76,6 +76,17 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %setup -q -c
 mv %{pecl_name}-%{version} NTS
 
+cd NTS
+sed -e 's/2.3.0/%{version}/' -i src/php_sdl.h
+
+# Sanity check, really often broken
+extver=$(sed -n '/#define PHP_SDL_VERSION/{s/.* "//;s/".*$//;p}' src/php_sdl.h)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}.
+   exit 1
+fi
+cd ..
+
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
@@ -188,6 +199,15 @@ fi
 
 
 %changelog
+* Mon Aug 24 2020 Remi Collet <remi@remirepo.net> - 2.4.0-1
+- update to 2.4.0
+- drop patch merged upstream
+- raise dependency on PHP 7.4
+
+* Wed Feb 26 2020 Remi Collet <remi@remirepo.net> - 2.3.0-2
+- add patch for duplicated symbols on GCC 10 from
+  https://github.com/Ponup/php-sdl/pull/39
+
 * Sun Sep  8 2019 Remi Collet <remi@remirepo.net> - 2.3.0-1
 - update to 2.3.0
 
-- 
cgit