summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-snuffleupagus.spec20
1 files changed, 19 insertions, 1 deletions
diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec
index 845299f..e4d950a 100644
--- a/php-snuffleupagus.spec
+++ b/php-snuffleupagus.spec
@@ -26,7 +26,7 @@
Summary: Security module for php7
Name: %{?sub_prefix}php-snuffleupagus
Version: 0.1.0
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: LGPLv3
Group: Development/Languages
URL: https://github.com/%{gh_owner}/%{gh_project}
@@ -34,6 +34,9 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: pcre-devel
+%if 0%{?rhel} == 7
+BuildRequires: devtoolset-6-toolchain
+%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
@@ -78,6 +81,9 @@ cd NTS
# needed because of sources relocation
sed -e 's:src/::' -i tests/multi_config.phpt
+# Only RPM build flags
+sed -e '/^CFLAGS/d' -i config.m4
+
# TODO not ok for now
# Sanity check, really often broken
#extver=$(sed -n '/#define PHP_SNUFFLEUPAGUS_VERSION/{s/.* "//;s/".*$//;p}' php_snuffleupagus.h)
@@ -103,7 +109,11 @@ EOF
%build
+%if 0%{?rhel} == 7
+source /opt/rh/devtoolset-6/enable
+%else
%{?dtsenable}
+%endif
cd NTS
%{_bindir}/phpize
@@ -125,7 +135,12 @@ make %{?_smp_mflags}
%install
+%if 0%{?rhel} == 7
+source /opt/rh/devtoolset-6/enable
+%else
%{?dtsenable}
+%endif
+
# Install the NTS stuff
make -C NTS install INSTALL_ROOT=%{buildroot}
@@ -184,6 +199,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Wed Jan 17 2018 Remi Collet <remi@remirepo.net> - 0.1.0-2
+- clean build options, fix EL-7 build
+
* Wed Jan 17 2018 Remi Collet <remi@remirepo.net> - 0.1.0-1
- new package, version 0.1.0
- open https://github.com/nbs-system/snuffleupagus/issues/123 - ZTS build