summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-02-26 13:25:26 +0100
committerRemi Collet <remi@remirepo.net>2018-02-26 13:25:26 +0100
commitd264d77adefb33d8490a5570c62ad4cde1f52084 (patch)
treea0f4b988180055964359bcefce7a3dbaa1b05281
parent7391036f976fb59fede79627b4caf93b33974901 (diff)
use "module load ..." command instead of "scl enable ..."
-rw-r--r--php-zephir-parser.spec16
1 files 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 <remi@remirepo.net> - 1.1.2-2
+- use "module load ..." command instead of "scl enable ..."
+
* Tue Jan 23 2018 Remi Collet <remi@remirepo.net> - 1.1.2-1
-- update to 1.1.8
+- update to 1.1.2
* Fri Nov 10 2017 Remi Collet <remi@remirepo.net> - 1.1.1-1
- update to 1.1.1