From d264d77adefb33d8490a5570c62ad4cde1f52084 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Feb 2018 13:25:26 +0100 Subject: use "module load ..." command instead of "scl enable ..." --- php-zephir-parser.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/php-zephir-parser.spec b/php-zephir-parser.spec index 5088721..105e2df 100644 --- a/php-zephir-parser.spec +++ b/php-zephir-parser.spec @@ -9,7 +9,7 @@ %if 0%{?scl:1} %global with_tests 0 -%scl_package zephyr-parser +%scl_package php-zephyr-parser %else %if 0%{?fedora} %global with_tests 0%{!?_without_tests:1} @@ -28,10 +28,9 @@ Name: %{?scl_prefix}%{gh_project} Version: 1.1.2 -Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Zephir parser extension -Group: Development/Libraries License: MIT URL: https://getcomposer.org/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz @@ -39,6 +38,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # honours RPM build flags and drop configure/make/install part Patch0: %{gh_project}-build.patch +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.5 %if 0%{?rhel} == 6 BuildRequires: re2c014 @@ -75,7 +75,10 @@ fi %build %{?dtsenable} -%{?scl:scl enable %{scl}} ./install +%{?scl:module load %{scl}} +echo $PATH +php-config --version +./install %configure \ --with-php-config=%{_bindir}/php-config \ @@ -114,8 +117,11 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Feb 26 2018 Remi Collet - 1.1.2-2 +- use "module load ..." command instead of "scl enable ..." + * Tue Jan 23 2018 Remi Collet - 1.1.2-1 -- update to 1.1.8 +- update to 1.1.2 * Fri Nov 10 2017 Remi Collet - 1.1.1-1 - update to 1.1.1 -- cgit