From 4eb1282fa2403d6d06f3ea356d159fac402b9a64 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 Aug 2024 15:02:23 +0200 Subject: cleanup --- php-pecl-uopz.spec | 48 +++++++++--------------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/php-pecl-uopz.spec b/php-pecl-uopz.spec index c540c3f..50ff031 100644 --- a/php-pecl-uopz.spec +++ b/php-pecl-uopz.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-uopz # -# Copyright (c) 2014-2021 Remi Collet +# Copyright (c) 2014-2024 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -24,8 +24,8 @@ Summary: User Operations for Zend Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 6.1.2 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} -License: PHP +Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} %if 0%{?gh_commit:1} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz @@ -54,19 +54,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %endif Conflicts: %{?scl_prefix}php-pecl-xdebug < 2.9.4 -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -%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 -%endif - %description The uopz extension is focused on providing utilities to aid with unit @@ -109,11 +96,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 -%patch0 -p1 -b .up +%patch -P0 -p1 -b .up # Sanity check, really often broken extver=$(sed -n '/#define PHP_UOPZ_VERSION/{s/.* "//;s/".*$//;p}' uopz.h) @@ -185,26 +172,6 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{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 cd NTS : Minimal load test for NTS extension @@ -236,7 +203,7 @@ REPORT_EXIT_STATUS=1 \ %files -%{?_licensedir:%license NTS/LICENSE} +%license NTS/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -250,6 +217,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Aug 27 2024 Remi Collet - 6.1.2-5 +- cleanup + * Tue Jun 30 2020 Remi Collet - 6.1.2-4 - add upstream patches for PHP 8 -- cgit