From 85f00423eb83eb08d4eda16168d743c29efdcd90 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 2 Jan 2020 07:43:15 +0100
Subject: - update to 2.1.0 - open https://github.com/SeasX/SeasLog/issues/286 
  broken build on 32-bit

---
 php-pecl-seaslog.spec | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

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

diff --git a/php-pecl-seaslog.spec b/php-pecl-seaslog.spec
index 25eda46..3435d78 100644
--- a/php-pecl-seaslog.spec
+++ b/php-pecl-seaslog.spec
@@ -25,13 +25,11 @@
 
 Summary:        An effective, fast, stable log extension for PHP
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        2.0.2
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        2.1.0
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        PHP
-URL:            http://pecl.php.net/package/%{proj_name}
-Source0:        http://pecl.php.net/get/%{proj_name}-%{version}.tgz
-
-Patch0:         https://github.com/SeasX/SeasLog/commit/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch
+URL:            https://pecl.php.net/package/%{proj_name}
+Source0:        https://pecl.php.net/get/%{proj_name}-%{version}.tgz
 
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel
@@ -54,20 +52,16 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-%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:      php73-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
-Obsoletes:     php74-pecl-%{pecl_name}  <= %{version}
+Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
@@ -106,7 +100,7 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .up
+sed -e 's/ifndef ulong/if 0/' -i include/php7_wrapper.h
 
 : Sanity check, really often broken
 extver=$(sed -n '/#define SEASLOG_VERSION /{s/.* "//;s/".*$//;p}' include/SeasLog.h)
@@ -259,6 +253,11 @@ fi
 
 
 %changelog
+* Thu Jan  2 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+- open https://github.com/SeasX/SeasLog/issues/286
+  broken build on 32-bit
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 2.0.2-3
 - rebuild for 7.4.0RC1
 
-- 
cgit