cleanupHEADmaster

1 files changed, 9 insertions, 47 deletions

diff --git a/php-pecl-taint.spec b/php-pecl-taint.spec
index 13711ea..a675097 100644
--- a/php-pecl-taint.spec
+++ b/php-pecl-taint.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-taint
 #
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2024 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -27,7 +27,7 @@ Version:       2.1.0
 Release:       0.3.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 %else
-Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 %endif
 License:       PHP
@@ -36,6 +36,7 @@ URL:           https://github.com/%{gh_owner}/%{gh_project}
 Patch1:        https://patch-diff.githubusercontent.com/raw/laruence/taint/pull/68.patch
 
 BuildRequires: %{?dtsprefix}gcc
+BuildRequires: make
 BuildRequires: %{?scl_prefix}php-devel > 7
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: %{?scl_prefix}php-pdo
@@ -44,22 +45,6 @@ BuildRequires: %{?scl_prefix}php-sqlite3
 
 Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:      %{?scl_prefix}php(api) = %{php_core_api}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-
-%if "%{?vendor}" == "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
-%endif
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
@@ -70,12 +55,6 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{rele
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 An extension used for detecting XSS codes(tainted string),
@@ -97,11 +76,11 @@ mv %{pecl_name}-%{version} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch1 -p1 -b .pr68
+%patch -P1 -p1 -b .pr68
 
 # When this file will be removed, clean the description.
 [ -f EXPERIMENTAL ] || exit 1
@@ -203,28 +182,8 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%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
-
-
 %files
-%{?_licensedir:%license NTS/LICENSE}
+%license NTS/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -238,6 +197,9 @@ fi
 
 
 %changelog
+* Tue Aug 27 2024 Remi Collet <remi@remirepo.net> - 2.1.0-2
+- cleanup
+
 * Thu Apr  9 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
 - update to 2.1.0