From e1854ff4cb4555e0b6a13cc33c2a0d3cd019efca Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 5 Oct 2020 07:38:03 +0200
Subject: update to 7.1.0RC2

---
 PHPINFO             |  2 +-
 REFLECTION          | 12 ++++++------
 php-pecl-dbase.spec | 37 ++++++++++++++++++++-----------------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 55fef7e..93844e6 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,4 +1,4 @@
 
 dbase
 
-Version => 7.0.1
+Version => 7.1.0RC2
diff --git a/REFLECTION b/REFLECTION
index ab95f46..374df43 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,11 +1,11 @@
-Extension [ <persistent> extension #84 dbase version 7.0.1 ] {
+Extension [ <persistent> extension #117 dbase version 7.1.0RC2 ] {
 
   - Constants [5] {
-    Constant [ string DBASE_VERSION ] { 7.0.1 }
-    Constant [ integer DBASE_TYPE_DBASE ] { 3 }
-    Constant [ integer DBASE_TYPE_FOXPRO ] { 48 }
-    Constant [ integer DBASE_RDONLY ] { 0 }
-    Constant [ integer DBASE_RDWR ] { 2 }
+    Constant [ string DBASE_VERSION ] { 7.1.0RC2 }
+    Constant [ int DBASE_TYPE_DBASE ] { 3 }
+    Constant [ int DBASE_TYPE_FOXPRO ] { 48 }
+    Constant [ int DBASE_RDONLY ] { 0 }
+    Constant [ int DBASE_RDWR ] { 2 }
   }
 
   - Functions {
diff --git a/php-pecl-dbase.spec b/php-pecl-dbase.spec
index a6a9b3c..5dafc34 100644
--- a/php-pecl-dbase.spec
+++ b/php-pecl-dbase.spec
@@ -1,12 +1,14 @@
 # remirepo spec file for php-pecl-dbase
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
+%bcond_without     tests
+
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
 
@@ -17,17 +19,18 @@
 
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name  dbase
-#global prever     RC1
 %global ini_name   40-%{pecl_name}.ini
-%global with_tests 0%{!?_without_tests:1}
+
+%global upstream_version 7.1.0
+%global upstream_prever  RC2
 
 Summary:        dBase database file access functions
 Name:           %{?sub_prefix}php-pecl-dbase
-Version:        7.0.1
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        PHP
-URL:            http://pecl.php.net/package/%{pecl_name}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+URL:            https://pecl.php.net/package/%{pecl_name}
+Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 7
@@ -46,22 +49,18 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{rele
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-%if "%{php_version}" > "7.1"
-Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
-%endif
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 %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:     php73w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
 Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
+Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
@@ -90,7 +89,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
@@ -98,10 +97,11 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+chmod -x *.c *.h
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_DBASE_VERSION/{s/.* "//;s/".*$//;p}' php_dbase.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream extension 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 ..
@@ -232,6 +232,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon Oct  5 2020 Remi Collet <remi@remirepo.net> - 7.1.0~RC2-1
+- update to 7.1.0RC2
+
 * Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 7.0.1-1
 - update to 7.0.1
 
-- 
cgit