summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-08-23 13:37:13 +0200
committerRemi Collet <remi@remirepo.net>2018-08-23 13:37:13 +0200
commitf3cce3961b819d2a8eb95a1ad9125a7ea1ea3913 (patch)
treeee4b0eb0408e66151aa969aaca0ade4463051946
parentf3abfd86fcd6d4165d1daaab8e3712d4c4bd7567 (diff)
scl-utils 2.0.2 drop modules support
-rw-r--r--php72.spec17
1 files changed, 13 insertions, 4 deletions
diff --git a/php72.spec b/php72.spec
index 0daba59..c9255d1 100644
--- a/php72.spec
+++ b/php72.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.2
Name: %scl_name
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Development/Languages
License: GPLv2+
@@ -204,6 +210,9 @@ restorecon -R %{_localstatedir} &>/dev/null || :
%{macrosdir}/macros.%{scl_name_base}-scldevel
%changelog
+* Thu Aug 23 2018 Remi Collet <remi@remirepo.net> 1.0-1
+- scl-utils 2.0.2 drop modules support
+
* Mon Nov 20 2017 Remi Collet <remi@remirepo.net> 1.0-1
- drop the experimental warning as 7.2.0 is close to GA