From c74ac329206e21a089e3e7d68982b8def14bc24b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Oct 2024 17:28:19 +0200 Subject: update to 3.4.0beta1 --- php-pecl-xdebug3.spec | 77 +++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 57 deletions(-) (limited to 'php-pecl-xdebug3.spec') diff --git a/php-pecl-xdebug3.spec b/php-pecl-xdebug3.spec index fb09e88..b935e78 100644 --- a/php-pecl-xdebug3.spec +++ b/php-pecl-xdebug3.spec @@ -15,23 +15,18 @@ %{?scl:%scl_package php-pecl-xdebug3} %bcond_without tests - -%if 0%{?rhel} == 7 -%bcond_with zlib -%else %bcond_without zlib -%endif %global pecl_name xdebug %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global gh_commit b8a7e3e2ce17ed775a2e92e362d65a061bce2da9 +%global gh_commit 921255659710b07db816bc0c71941a5a00b6bf6c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20201011 # version/release %global upstream_version 3.4.0 -%global upstream_prever alpha1 -%global upstream_lower %%(echo %%{upstream_prever} | tr '[:upper:]' '[:lower:]') +%global upstream_prever beta1 +%global upstream_lower %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]') %global sources src %global _configure ../%{sources}/configure @@ -50,11 +45,12 @@ Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_ License: Xdebug-1.03 URL: https://xdebug.org/ Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz +# file is corrupted in 3.4.0beta1 tag +Source1: https://raw.githubusercontent.com/%{pecl_name}/%{pecl_name}/refs/tags/3.4.0alpha1/xdebug.ini BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 8.0 -BuildRequires: %{?scl_prefix}php-devel < 8.4 +BuildRequires: (%{?scl_prefix}php-devel >= 8.0 with %{?scl_prefix}php-devel < 8.5) BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-simplexml BuildRequires: libtool @@ -75,27 +71,6 @@ Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 3 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} == 7 -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -%endif - %description The Xdebug extension helps you debugging your script by providing a lot of @@ -136,9 +111,11 @@ mv %{pecl_name}-%{gh_commit} %{sources} mv %{sources}/package.xml . %endif -%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} +sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} +cp %{SOURCE1} xdebug.ini + # Check extension version ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h) if test "$ver" != "%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then @@ -170,6 +147,7 @@ head -n15 <%{ini_name} cd %{sources} %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global cd ../NTS %configure \ @@ -180,7 +158,8 @@ cd ../NTS --without-xdebug-compression \ %endif --with-php-config=%{__phpconfig} -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS @@ -192,7 +171,8 @@ cd ../ZTS --without-xdebug-compression \ %endif --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} + +%make_build %endif @@ -200,7 +180,7 @@ make %{?_smp_mflags} %{?dtsenable} # install NTS extension -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS # install package registration file install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml @@ -210,7 +190,7 @@ install -Dpm 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %if %{with_zts} # Install ZTS extension -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -Dpm 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -284,28 +264,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 %{sources}/LICENSE} +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -319,6 +279,9 @@ fi %changelog +* Fri Oct 4 2024 Remi Collet - 3.4.0~beta1-1 +- update to 3.4.0beta1 + * Fri May 31 2024 Remi Collet - 3.4.0~alpha1-1 - update to 3.4.0alpha1 -- cgit