cleanup

5 files changed, 40 insertions, 372 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6f69818
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.bz2
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/REFLECTION b/REFLECTION
index 31a1536..8072022 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #63 dbase version 5.1.1 ] {
+Extension [ <persistent> extension #79 dbase version 7.0.0beta1 ] {
 
   - Functions {
     Function [ <internal:dbase> function dbase_open ] {
diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7
deleted file mode 100644
index 8072022..0000000
--- a/REFLECTION-PHP7
+++ /dev/null
@@ -1,86 +0,0 @@
-Extension [ <persistent> extension #79 dbase version 7.0.0beta1 ] {
-
-  - Functions {
-    Function [ <internal:dbase> function dbase_open ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $name ]
-        Parameter #1 [ <required> $mode ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_create ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $filename ]
-        Parameter #1 [ <required> array $fields ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_close ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $identifier ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_numrecords ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $identifier ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_numfields ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $identifier ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_add_record ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $identifier ]
-        Parameter #1 [ <required> array $data ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_replace_record ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $identifier ]
-        Parameter #1 [ <required> array $data ]
-        Parameter #2 [ <required> $recnum ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_get_record ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $identifier ]
-        Parameter #1 [ <required> $record ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_get_record_with_names ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $identifier ]
-        Parameter #1 [ <required> $record ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_delete_record ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $identifier ]
-        Parameter #1 [ <required> $record ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_pack ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $identifier ]
-      }
-    }
-    Function [ <internal:dbase> function dbase_get_header_info ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $database_handle ]
-      }
-    }
-  }
-}
-
diff --git a/php-pecl-dbase-php7.spec b/php-pecl-dbase-php7.spec
deleted file mode 100644
index 74868b1..0000000
--- a/php-pecl-dbase-php7.spec
+++ /dev/null
@@ -1,250 +0,0 @@
-# remirepo spec file for php-pecl-dbase
-#
-# Copyright (c) 2015-2017 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# Please, preserve the changelog entries
-#
-%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
-%scl_package       php-pecl-dbase
-%endif
-
-
-%global with_zts   0%{?__ztsphp:1}
-%global pecl_name  dbase
-%global prever     beta1
-%global ini_name   40-%{pecl_name}.ini
-%global with_tests 0%{!?_without_tests:1}
-
-Summary:        dBase database file access functions
-Name:           %{?sub_prefix}php-pecl-dbase
-Version:        7.0.0
-Release:        0.3.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License:        PHP
-Group:          Development/Languages
-URL:            http://pecl.php.net/package/%{pecl_name}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
-# Created from svn
-# see http://svn.php.net/viewvc?view=revision&revision=340710
-Source1:        http://pecl.php.net/get/%{pecl_name}-tests-%{version}.tgz
-
-BuildRequires:  %{?scl_prefix}php-devel > 7
-BuildRequires:  %{?scl_prefix}php-pear
-
-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}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-%endif
-
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
-%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
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
-
-%description
-These functions allow you to access records stored
-in dBase-format (dbf) databases.
-
-There is no support for indexes or memo fields.
-There is no support for locking, too.
-Two concurrent webserver processes modifying the
-same dBase file will very likely ruin your database.
-
-dBase files are simple sequential files of fixed length records.
-Records are appended to the end of the file and delete records
-are kept until you call dbase_pack().
-
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}.
-
-
-%prep
-%setup -q -c -a1
-mv %{pecl_name}-%{version}%{?prever} NTS
-mv tests NTS/tests
-
-# Don't install/register tests
-sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
-    -i package.xml
-
-cd NTS
-
-# 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}.
-   exit 1
-fi
-cd ..
-
-%if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
-%endif
-
-# Create configuration file
-cat << 'EOF' | tee %{ini_name}
-; Enable %{summary} extension module
-extension=%{pecl_name}.so
-EOF
-
-
-%build
-cd NTS
-%{_bindir}/phpize
-%configure \
-    --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/php-config
-
-make %{?_smp_mflags}
-
-%if %{with_zts}
-cd ../ZTS
-%{_bindir}/zts-phpize
-%configure \
-    --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/zts-php-config
-
-make %{?_smp_mflags}
-%endif
-
-
-%install
-make -C NTS install INSTALL_ROOT=%{buildroot}
-
-# install config file
-install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-# Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-%if %{with_zts}
-make -C ZTS install INSTALL_ROOT=%{buildroot}
-
-install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
-# Documentation
-for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
-
-%if 0%{?fedora} < 24
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
-%check
-: Minimal load test for NTS extension
-%{__php} --no-php-ini \
-    --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%if %{with_tests}
-cd NTS
-: Upstream test suite for NTS extension
-TEST_PHP_EXECUTABLE=%{__php} \
-TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__php} -n run-tests.php
-%endif
-
-%if %{with_zts}
-: Minimal load test for ZTS extension
-%{__ztsphp} --no-php-ini \
-    --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%if %{with_tests}
-cd ../ZTS
-: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php
-%endif
-%endif
-
-
-%files
-%{?_licensedir:%license NTS/LICENSE}
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
-
-%config(noreplace) %{php_inidir}/%{ini_name}
-%{php_extdir}/%{pecl_name}.so
-
-%if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%{php_ztsextdir}/%{pecl_name}.so
-%endif
-
-
-%changelog
-* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 7.0.0-0.3.beta1.7.0
-- rebuild for PHP 7.2.0beta1 new API
-
-* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 7.0.0-0.2.beta1
-- rebuild with PHP 7.1.0 GA
-
-* Wed Oct 26 2016 Remi Collet <remi@fedoraproject.org> - 7.0.0-0.1.beta1
-- update to 7.0.0beta1 for PHP 7
-
-* Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 5.1.0-2
-- adapt for F24
-
-* Tue Aug 25 2015 Remi Collet <remi@fedoraproject.org> - 5.1.0-1
-- initial package, version 5.1.0 (stable)
-
diff --git a/php-pecl-dbase.spec b/php-pecl-dbase.spec
index 0233fb7..38b786b 100644
--- a/php-pecl-dbase.spec
+++ b/php-pecl-dbase.spec
@@ -1,44 +1,35 @@
 # remirepo spec file for php-pecl-dbase
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %if 0%{?scl:1}
-%if "%{scl}" == "rh-php56"
-%global sub_prefix more-php56-
-%else
 %global sub_prefix %{scl_prefix}
-%endif
 %scl_package       php-pecl-dbase
 %endif
 
 
-%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
+%global with_zts   0%{?__ztsphp:1}
 %global pecl_name  dbase
-#global versuf     -beta
-%if "%{php_version}" < "5.6"
-%global ini_name   %{pecl_name}.ini
-%else
+%global prever     beta1
 %global ini_name   40-%{pecl_name}.ini
-%endif
 %global with_tests 0%{!?_without_tests:1}
 
 Summary:        dBase database file access functions
 Name:           %{?sub_prefix}php-pecl-dbase
-Version:        5.1.1
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        7.0.0
+Release:        0.3.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        PHP
-Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-# Created from PHP 5.2.17 tarball
+Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+# Created from svn
+# see http://svn.php.net/viewvc?view=revision&revision=340710
 Source1:        http://pecl.php.net/get/%{pecl_name}-tests-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  %{?scl_prefix}php-devel < 7
+BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -60,13 +51,19 @@ Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
+%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
 %endif
 
@@ -95,8 +92,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c -a1
-
-mv %{pecl_name}-%{version} NTS
+mv %{pecl_name}-%{version}%{?prever} NTS
 mv tests NTS/tests
 
 # Don't install/register tests
@@ -108,8 +104,8 @@ cd NTS
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_DBASE_VERSION/{s/.* "//;s/".*$//;p}' php_dbase.h)
-if test "x${extver}" != "x%{version}%{?versuf}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?versuf}.
+if test "x${extver}" != "x%{version}%{?prever}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
    exit 1
 fi
 cd ..
@@ -147,8 +143,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install config file
@@ -169,7 +163,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
 if [ -x %{__pecl} ] ; then
@@ -223,12 +217,7 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -243,8 +232,14 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Oct 27 2016 Remi Collet <remi@fedoraproject.org> - 5.1.1-1
-- update to 5.1.1 (stable)
+* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 7.0.0-0.3.beta1.7.0
+- rebuild for PHP 7.2.0beta1 new API
+
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 7.0.0-0.2.beta1
+- rebuild with PHP 7.1.0 GA
+
+* Wed Oct 26 2016 Remi Collet <remi@fedoraproject.org> - 7.0.0-0.1.beta1
+- update to 7.0.0beta1 for PHP 7
 
 * Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 5.1.0-2
 - adapt for F24