scl-utils 2.0.2 drop modules support

1 files changed, 13 insertions, 4 deletions

diff --git a/php70.spec b/php70.spec
index de5ab62..b12e945 100644
--- a/php70.spec
+++ b/php70.spec
@@ -3,15 +3,21 @@
 %global scl              %{scl_name_base}%{scl_name_version}
 %global macrosdir        %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_root_sysconfdir}/rpm; echo $d)
 %global install_scl      1
+
 %if 0%{?fedora} >= 20
-# Requires scl-utils v2 for SCL integration
-%global with_modules     1
 %global rh_layout        1
 %else
+%global nfsmountable     1
+%endif
+
+%if 0%{?fedora} >= 20 && 0%{?fedora} < 27
+# Requires scl-utils v2 for SCL integration, dropeed in F29
+%global with_modules     1
+%else
 # Works with file installed in /usr/share/Modules/modulefiles/
 %global with_modules     0
-%global nfsmountable     1
 %endif
+
 %scl_package %scl
 
 # do not produce empty debuginfo package
@@ -20,7 +26,7 @@
 Summary:       Package that installs PHP 7.0
 Name:          %scl_name
 Version:       1.0
-Release:       5%{?dist}
+Release:       6%{?dist}
 Group:         Development/Languages
 License:       GPLv2+
 
@@ -205,6 +211,9 @@ restorecon -R %{_localstatedir} &>/dev/null || :
 
 
 %changelog
+* Thu Aug 23 2018 Remi Collet <remi@remirepo.net> 1.0-6
+- scl-utils 2.0.2 drop modules support
+
 * Wed Jun  8 2016 Remi Collet <remi@fedoraproject.org> 1.0-5
 - fix description (PHP 7.0 is stable)