update to 1.0.0RC1 (beta)

4 files changed, 42 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/PHPINFO b/PHPINFO
index 4945522..7df5649 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,7 +1,7 @@
 
 xmlrpc
 
-XMLRPC extension version => 1.0.0-dev
+XMLRPC extension version => 1.0.0RC1
 core library version => xmlrpc-epi v. 0.51
 author => Dan Libby
 homepage => http://xmlrpc-epi.sourceforge.net
diff --git a/REFLECTION b/REFLECTION
index 112354f..7000833 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #68 xmlrpc version 1.0.0-dev ] {
+Extension [ <persistent> extension #68 xmlrpc version 1.0.0RC1 ] {
 
   - Functions {
     Function [ <internal:xmlrpc> function xmlrpc_encode ] {
diff --git a/php-pecl-xmlrpc.spec b/php-pecl-xmlrpc.spec
index a7d933b..5bc1451 100644
--- a/php-pecl-xmlrpc.spec
+++ b/php-pecl-xmlrpc.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-xmlrpc
 #
-# Copyright (c) 2020 Remi Collet
+# Copyright (c) 2020-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -20,26 +20,32 @@
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    php
 %global gh_project  pecl-networking-xmlrpc
-%global gh_date     20200602
+#global gh_date     20200602
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name   xmlrpc
 %global with_tests  0%{!?_without_tests:1}
 %global upver       1.0.0
-%global lower       DEV
+%global rcver       RC1
+%global lower       rc1
 # After 20-xml
 %global ini_name    30-%{pecl_name}.ini
 
 Summary:        Functions to write XML-RPC servers and clients
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release:        4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 
 # Extension is PHP
 # Library is BSD
 License:        PHP and BSD
 URL:            https://pecl.php.net/package/%{pecl_name}
+%if 0%{?gh_date}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{upver}-%{gh_short}.tar.gz
+%else
+Source0:        https://pecl.php.net/get/%{pecl_name}-%{upver}%{?rcver}.tgz
+%endif
 
+BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 8.0
 BuildRequires:  %{?scl_prefix}php-pear
@@ -75,16 +81,26 @@ You can find more information about XML-RPC at http://www.xmlrpc.com/,
 and more documentation on this extension and its functions at
 http://xmlrpc-epi.sourceforge.net/.
 
-This extension which was previously part of the PHP distribution.
-
-This package is only provided for legacy applications.
+The extension is unbundled from php-src as of PHP 8.0.0, because the underlying
+libxmlrpc has obviously been abandoned. It is recommended to reevaluate using
+this extension.
 
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
 
 %prep
 %setup -qc
+%if 0%{?gh_date}
 mv %{gh_project}-%{gh_commit} NTS
+%else
+mv %{pecl_name}-%{upver}%{?rcver} NTS
+%endif
+
+sed -e 's/role="test"/role="src"/' \
+    -e '/COPYING/s/role="src"/role="doc"/' \
+    %{?_licensedir:-e '/COPYING/s/role="doc"/role="src"/' } \
+    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -i package.xml
 
 cd NTS
 # Check version as upstream often forget to update this
@@ -137,12 +153,20 @@ make %{?_smp_mflags}
 make -C NTS install INSTALL_ROOT=%{buildroot}
 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
+
 # Install the ZTS stuff
 %if %{with_zts}
 make -C ZTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
+# Test & 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
+
 
 %check
 cd NTS
@@ -178,9 +202,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %files
-%{!?_licensedir:%global license %%doc}
-%license NTS/LICENSE
-%license NTS/libxmlrpc/COPYING
+%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license NTS/libxmlrpc/COPYING}
+%doc %{pecl_docdir}/%{pecl_name}
+%{pecl_xmldir}/%{name}.xml
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@@ -192,6 +217,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Jan  5 2021 Remi Collet <remi@remirepo.net> - 1.0.0~rc1-1
+- update to 1.0.0RC1 (beta)
+
 * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.0.0~DEV.20200602-4
 - rebuild for PHP 8.0.0RC1