diff options
| author | Remi Collet <remi@remirepo.net> | 2024-09-30 11:57:05 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-09-30 11:57:05 +0200 |
| commit | c3a46aa7918297c251df1a7e6677016b5ad03052 (patch) | |
| tree | 68f30dc39f7cb858897fbf1dc3948de145e720e2 /php-pecl-uuid.spec | |
| parent | 3cc75383565539ba875ee8b464a6d4fff9b741ab (diff) | |
fix workaround for recent util-linux
see https://bugzilla.redhat.com/2315645
Diffstat (limited to 'php-pecl-uuid.spec')
| -rw-r--r-- | php-pecl-uuid.spec | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/php-pecl-uuid.spec b/php-pecl-uuid.spec index b765a82..a84efd0 100644 --- a/php-pecl-uuid.spec +++ b/php-pecl-uuid.spec @@ -24,7 +24,7 @@ Summary: Universally Unique Identifier extension for PHP Name: %{?scl_prefix}php-pecl-uuid Version: 1.2.0 -Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: LGPL-2.1-or-later URL: https://pecl.php.net/package/uuid Source: https://pecl.php.net/get/%{sources}.tgz @@ -33,7 +33,7 @@ Patch0: %{pecl_name}-workaround.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel > 7 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear BuildRequires: libuuid-devel @@ -94,13 +94,15 @@ export PHP_RPATH=no cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure \ --with-php-config=%{__phpconfig} \ --with-libdir=%{_lib} \ --with-uuid -make %{?_smp_mflags} +%make_build %if %{with_zts} cd ../ZTS @@ -108,7 +110,7 @@ cd ../ZTS --with-php-config=%{__ztsphpconfig} \ --with-libdir=%{_lib} \ --with-uuid -make %{?_smp_mflags} +%make_build %endif @@ -116,12 +118,12 @@ make %{?_smp_mflags} %{?dtsenable} # Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %if %{with_zts} # Install the ZTS stuff -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -182,6 +184,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Sep 30 2024 Remi Collet <remi@remirepo.net> - 1.2.0-9 +- fix workaround for recent util-linux + see https://bugzilla.redhat.com/2315645 + * Tue Aug 27 2024 Remi Collet <remi@remirepo.net> - 1.2.0-8 - workaround for recent util-linux |