cleanupHEADmaster

1 files changed, 7 insertions, 42 deletions

diff --git a/php-pecl-http-message.spec b/php-pecl-http-message.spec
index 690c268..f9a84f5 100644
--- a/php-pecl-http-message.spec
+++ b/php-pecl-http-message.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-http-message
 #
-# Copyright (c) 2019-2021 Remi Collet
+# Copyright (c) 2019-2024 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -21,8 +21,8 @@
 Summary:        PSR-7 HTTP Message implementation
 Name:           %{?sub_prefix}php-pecl-http-message
 Version:        1.0.0
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License:        BSD
+Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+License:        MIT
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
@@ -41,7 +41,6 @@ Requires:       %{?scl_prefix}php-psr%{?_isa} >= 1.2
 %else
 Requires:       %{?scl_prefix}php-psr%{?_isa} >= 0.6
 %endif
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
@@ -50,23 +49,6 @@ Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "7.3"
-Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.1"
-Obsoletes:      php81-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
-
 
 %description
 PSR-7 compatible HTTP Message implementation as PHP extension.
@@ -94,7 +76,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
-%patch1 -p1 -b .pr7
+%patch -P1 -p1 -b .pr7
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_HTTP_MESSAGE_VERSION/{s/.* "//;s/".*$//;p}' php_http_message.h)
@@ -162,26 +144,6 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
 done
 
 
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# 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
 OPT="-n -d extension=psr"
 
@@ -243,6 +205,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Aug 22 2024 Remi Collet <remi@remirepo.net> - 1.0.0-2
+- cleanup
+
 * Mon Dec 13 2021 Remi Collet <remi@remirepo.net> - 1.0.0-1
 - update to 1.0.0
 - drop patches merged upstream