update to 4.7.2

open https://github.com/openswoole/swoole-src/pull/17
  openswoole conflicts with swoole

1 files changed, 33 insertions, 30 deletions

diff --git a/php-pecl-openswoole.spec b/php-pecl-openswoole.spec
index c2e8e18..d50a765 100644
--- a/php-pecl-openswoole.spec
+++ b/php-pecl-openswoole.spec
@@ -15,10 +15,9 @@
 %endif
 
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name  swoole
-%global proj_name  openswoole
+%global pecl_name  openswoole
 # After 20-sockets, 20-json and 20-mysqlnd
-%global ini_name   40-%{proj_name}.ini
+%global ini_name   40-%{pecl_name}.ini
 
 %bcond_without     cares
 %bcond_without     nghttpd2
@@ -28,19 +27,19 @@
 %bcond_with        brotli
 %endif
 
-%global upstream_version 4.7.1
+%global upstream_version 4.7.2
 #global upstream_prever  RC2
 
 
 Summary:        PHP's asynchronous concurrent distributed networking framework
-Name:           %{?scl_prefix}php-pecl-%{proj_name}
+Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 # Extension is ASL 2.0
 # Hiredis is BSD
 License:        ASL 2.0 and BSD
-URL:            https://pecl.php.net/package/%{proj_name}
-Source0:        https://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz
+URL:            https://pecl.php.net/package/%{pecl_name}
+Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
@@ -72,23 +71,23 @@ Requires:       %{?scl_prefix}php-mysqlnd%{?_isa}
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{proj_name})         = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version}
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 
-# Single version can be installed (same ext name)
+# Single version can be installed (same symbols)
 Conflicts:      %{?sub_prefix}php-pecl-%{pecl_name}  < 4
 Conflicts:      %{?sub_prefix}php-pecl-%{pecl_name}2 < 4
 Conflicts:      %{?sub_prefix}php-pecl-%{pecl_name}4 < 5
 
 %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 %if "%{php_version}" > "7.4"
-Obsoletes:      php74-pecl-%{proj_name} <= %{version}
+Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "8.0"
-Obsoletes:      php80-pecl-%{proj_name} <= %{version}
+Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "8.1"
-Obsoletes:      php81-pecl-%{proj_name} <= %{version}
+Obsoletes:      php81-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
@@ -133,7 +132,7 @@ These are the files needed to compile programs using %{name}.
 
 %prep
 %setup -q -c
-mv %{proj_name}-%{upstream_version}%{?upstream_prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 
 # Don't install/register tests, install examples as doc
@@ -165,7 +164,7 @@ cp -pr NTS ZTS
 
 # Create configuration file
 cat << 'EOF' | tee %{ini_name}
-; Enable %{proj_name} extension module
+; Enable %{pecl_name} extension module
 extension=%{pecl_name}.so
 
 ; Configuration
@@ -232,15 +231,15 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 
 # Test and Documentation
 for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{proj_name}/$i
+do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
 done
 for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{proj_name}/$i
+do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 # code not compatible with Python 3
-rm %{buildroot}%{pecl_testdir}/%{proj_name}/tests/swoole_process/echo.py
-rm %{buildroot}%{pecl_docdir}/%{proj_name}/examples/process/echo.py
+rm %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/swoole_process/echo.py
+rm %{buildroot}%{pecl_docdir}/%{pecl_name}/examples/process/echo.py
 
 
 %if 0%{?fedora} < 24 && 0%{?rhel} < 8
@@ -258,7 +257,7 @@ fi
 
 %postun
 if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{proj_name} >/dev/null || :
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
 fi
 %endif
 
@@ -286,12 +285,10 @@ cd ../ZTS
 
 
 %files
-%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license NTS/LICENSE*}
 %{?_licensedir:%license NTS/*-COPYING}
-%{!?_licensedir:%{pecl_docdir}/%{proj_name}/LICENSE}
-%{!?_licensedir:%{pecl_docdir}/%{proj_name}/thirdparty/*/COPYING}
-%doc %{pecl_docdir}/%{proj_name}/*md
-%doc %{pecl_docdir}/%{proj_name}/CREDITS
+%{!?_licensedir:%{pecl_docdir}/%{pecl_name}/LICENSE}
+%{!?_licensedir:%{pecl_docdir}/%{pecl_name}/thirdparty/*/COPYING}
 %{pecl_xmldir}/%{name}.xml
 
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -304,11 +301,12 @@ cd ../ZTS
 
 
 %files devel
-%doc %{pecl_testdir}/%{proj_name}
-%doc %{pecl_docdir}/%{proj_name}/examples
-%doc %{pecl_docdir}/%{proj_name}/gdbinit
-%doc %{pecl_docdir}/%{proj_name}/thirdparty
-%doc %{pecl_docdir}/%{proj_name}/travis
+%doc %{pecl_testdir}/%{pecl_name}
+%doc %{pecl_docdir}/%{pecl_name}/*md
+%doc %{pecl_docdir}/%{pecl_name}/examples
+%doc %{pecl_docdir}/%{pecl_name}/gdbinit
+%doc %{pecl_docdir}/%{pecl_name}/thirdparty
+%doc %{pecl_docdir}/%{pecl_name}/travis
 %{php_incldir}/ext/%{pecl_name}
 
 %if %{with_zts}
@@ -317,6 +315,11 @@ cd ../ZTS
 
 
 %changelog
+* Mon Oct 25 2021 Remi Collet <remi@remirepo.net> - 4.7.2-1
+- update to 4.7.2
+- open https://github.com/openswoole/swoole-src/pull/17
+  openswoole conflicts with swoole
+
 * Wed Oct 13 2021 Remi Collet <remi@remirepo.net> - 4.7.1-1
 - new package php-pecl-openswoole